[makefile] CFLAGS should only contains flags that are optional

-bin-annot does not exist in old version of ocaml, thus breaks the ubuntu precise builds.
With this commit, one can use `make CFLAGS=` to build using an old ocaml.

Makefile

@@ -23,7 +23,8 @@ OCAMLOPT?=ocamlopt
 OCAMLC?=ocamlc
 LFLAGS=
 
-CFLAGS= -bin-annot -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize \
+CFLAGS= -bin-annot
+ALL_CFLAGS= $(CFLAGS) -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize \
 	-I src -I src/generators -I src/macro -I src/optimization -I src/syntax -I src/typing -I src/display
 
 LIBS=unix str libs/extlib/extLib libs/xml-light/xml-light libs/swflib/swflib \
@@ -45,9 +46,9 @@ else
 	MODULE_EXT = cmx
 endif
 
-CC_CMD = $(COMPILER) $(CFLAGS) -c $<
+CC_CMD = $(COMPILER) $(ALL_CFLAGS) -c $<
 
-CC_PARSER_CMD = $(COMPILER) -pp camlp4o $(CFLAGS) -c src/syntax/parser.ml
+CC_PARSER_CMD = $(COMPILER) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml
 
 RELDIR=../../..
 
@@ -219,7 +220,7 @@ src/main.$(MODULE_EXT): src/optimization/filters.$(MODULE_EXT) src/typing/matche
 
 src/version.$(MODULE_EXT):
 	$(MAKE) -f Makefile.version_extra -s --no-print-directory ADD_REVISION=$(ADD_REVISION) BRANCH=$(BRANCH) COMMIT_SHA=$(COMMIT_SHA) COMMIT_DATE=$(COMMIT_DATE) > src/version.ml
-	$(COMPILER) $(CFLAGS) -c src/version.ml
+	$(COMPILER) $(ALL_CFLAGS) -c src/version.ml
 
 # Package
 

Makefile.win

@@ -32,8 +32,8 @@ FILTER=sed '/File/{ N; s/File "\([^"]\+\)", line \([0-9]\+\), characters \([0-9-
 endif
 
 ifdef FILTER
-CC_CMD=($(OCAMLOPT) $(CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
-CC_PARSER_CMD=($(OCAMLOPT) -pp camlp4o $(CFLAGS) -c src/syntax/parser.ml 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
+CC_CMD=($(OCAMLOPT) $(ALL_CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
+CC_PARSER_CMD=($(OCAMLOPT) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
 endif
 
 package_bin:

libs

@@ -1 +1 @@
-Subproject commit 39f1f79b52fbc02d3b89cda6cad4f08dd88b849a
+Subproject commit 695be4267fcb310d688afc28f7adf6b688dddb9b

tests/misc/cppObjc/native/Makefile

@@ -8,13 +8,13 @@ libtest.a : $(OBJECTS)
 	ranlib libtest.a
 
 %.c.o : %.c $(C_DEPS)
-	$(VERBOSE)$(CC) $(CFLAGS) -o $@ -c $<
+	$(VERBOSE)$(CC) $(ALL_CFLAGS) -o $@ -c $<
 	 
 %.cpp.o : %.cpp $(C_DEPS)
 	$(VERBOSE)$(CXX) $(CXXFLAGS) -o $@ -c $<
 	 
 %.m.o : %.m $(C_DEPS)
-	$(VERBOSE)$(CXX) $(CFLAGS) -o $@ -c $<
+	$(VERBOSE)$(CXX) $(ALL_CFLAGS) -o $@ -c $<
 	 
 %.mm.o : %.mm $(C_DEPS)
 	$(VERBOSE)$(CXX) $(CXXFLAGS) -o $@ -c $<