Commit b1c8884c authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Set the OCAMLFLAGS in Makefile.common.source (vs all Makefiles).

parent ecf174c3
......@@ -184,6 +184,15 @@ else
CC=gcc -g -O2 -fpic
OCAMLFLAGS =
OCAMLNCFLAGS =
ifdef SPEED
OCAMLFLAGS = -noassert -unsafe
OCAMLNCFLAGS = -inline 10
endif
endif
endif
endif
......
......@@ -4,11 +4,6 @@ include $(LURETTE_PATH)/Makefile.common.source
include $(LURETTE_PATH)/source/Makefile.ln
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......
......@@ -6,11 +6,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......
......@@ -4,11 +4,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......
......@@ -7,13 +7,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
CC=$(GCC) -g -O2 $(DWIN32)
......
......@@ -7,11 +7,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
STATIC=yes
......
......@@ -10,11 +10,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
#STATIC=yes
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......
......@@ -7,12 +7,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......
......@@ -7,11 +7,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
LIBS = unix str
CLIBS =
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
ifdef STATIC
OCAMLLDFLAGS = -cclib -ldl -cclib -lm -cclib -lc -ccopt -static
......
......@@ -10,11 +10,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
#STATIC=yes
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......@@ -98,10 +93,14 @@ LURETTE_SOURCES=\
$(OBJDIR)/fair_bddd.ml \
$(OBJDIR)/solver.mli \
$(OBJDIR)/solver.ml \
$(OBJDIR)/show_env.mli \
$(OBJDIR)/show_env.ml \
$(OBJDIR)/prog.ml \
$(OBJDIR)/prog.mli \
$(OBJDIR)/fGen.mli \
$(OBJDIR)/fGen.ml \
$(OBJDIR)/lucParse.mli \
$(OBJDIR)/lucParse.ml \
$(OBJDIR)/lucky.mli \
$(OBJDIR)/lucky.ml \
$(OBJDIR)/rif.mli \
......@@ -145,12 +144,18 @@ SOURCES=\
$(OBJDIR)/expand.mli \
$(OBJDIR)/autoExplore.ml \
$(OBJDIR)/autoExplore.mli \
$(OBJDIR)/mainArg.mli \
$(OBJDIR)/mainArg.ml \
$(OBJDIR)/auto2Lucky.ml \
$(OBJDIR)/auto2Lucky.mli \
$(OBJDIR)/lutProg.ml \
$(OBJDIR)/lutProg.mli \
$(OBJDIR)/lucProg.ml \
$(OBJDIR)/lucProg.mli \
$(OBJDIR)/luciole.ml \
$(OBJDIR)/luc2alice.ml \
$(OBJDIR)/luc2c.mli \
$(OBJDIR)/luc2c.ml \
$(OBJDIR)/mainArg.mli \
$(OBJDIR)/mainArg.ml \
$(OBJDIR)/main.ml \
......
......@@ -297,6 +297,9 @@ lucky_debug_no_assert:
lutin:$(OBJDIR)
cd $(OBJDIR) && $(MAKE) -k ln -f ../*/Makefile.lutin && $(MAKE) -k nc -f ../*/Makefile.lutin
lutin_debug:$(OBJDIR)
cd $(OBJDIR) && $(MAKE) -k ln -f ../*/Makefile.lutin && $(MAKE) -k dc -f ../*/Makefile.lutin
lutin_clean:$(OBJDIR)
cd $(OBJDIR) && $(MAKE) -f ../*/Makefile.lutin clean
......
......@@ -3,11 +3,6 @@
include $(LURETTE_PATH)/Makefile.common.source
include $(LURETTE_PATH)/source/Makefile.ln
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
IDLFLAGS=-nocpp
......
......@@ -7,11 +7,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
STATIC=yes
......
......@@ -8,11 +8,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I ../$(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
CC=gcc -O2 $(DWIN32)
......
......@@ -8,11 +8,6 @@ include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I ../$(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
CC=gcc -O2 $(DWIN32)
......
......@@ -6,12 +6,6 @@ include $(LURETTE_PATH)/Makefile.common.source
include $(LURETTE_PATH)/source/Makefile.ln
######################################################################
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
#OCAMLFLAGS := -noassert -unsafe
OCAMLFLAGS := -unsafe
endif
OCAMLFLAGS += -I ../$(OBJDIR)
CC=$(GCC) -O2 $(DWIN32)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment