Undefined variables preferred to empty ones in Makefiles.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10361 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

15 files changed, 27 insertions, 21 deletions

diff --git a/testsuite/interactive/lib-graph-2/Makefile b/testsuite/interactive/lib-graph-2/Makefile
index 354953bfcc..6ede5e50bf 100644
--- a/testsuite/interactive/lib-graph-2/Makefile
+++ b/testsuite/interactive/lib-graph-2/Makefile
@@ -1,6 +1,6 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=graph_test
-ADD_COMPFLAGS=
+#ADD_COMPFLAGS=
 LIBRARIES=graphics
 
 include ../../makefiles/Makefile.one
diff --git a/testsuite/interactive/lib-graph-3/Makefile b/testsuite/interactive/lib-graph-3/Makefile
index 295f47895c..a37aa33d61 100644
--- a/testsuite/interactive/lib-graph-3/Makefile
+++ b/testsuite/interactive/lib-graph-3/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=sorts
 ADD_COMPFLAGS=-thread
 LIBRARIES=unix threads graphics
diff --git a/testsuite/interactive/lib-graph/Makefile b/testsuite/interactive/lib-graph/Makefile
index de2c9e8656..be82565857 100644
--- a/testsuite/interactive/lib-graph/Makefile
+++ b/testsuite/interactive/lib-graph/Makefile
@@ -1,6 +1,6 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=graph_example
-ADD_COMPFLAGS=
+#ADD_COMPFLAGS=
 LIBRARIES=graphics
 
 include ../../makefiles/Makefile.one
diff --git a/testsuite/makefiles/Makefile.common b/testsuite/makefiles/Makefile.common
index 1ee9bc8eb5..da3ac643c2 100644
--- a/testsuite/makefiles/Makefile.common
+++ b/testsuite/makefiles/Makefile.common
@@ -15,7 +15,7 @@ OCAMLMKLIB=$(OCAMLRUN) $(TOPDIR)/tools/ocamlmklib$(EXE)
 OCAMLYACC=$(TOPDIR)/yacc/ocamlyacc$(EXE)
 OCAMLBUILD=$(TOPDIR)/_build/ocamlbuild/ocamlbuild.native
 DUMPOBJ=$(OCAMLRUN) $(TOPDIR)/tool/dumpobj$(EXE)
-COMPFLAGS=
+#COMPFLAGS=
 FORTRAN_COMPILER=/sw/bin/gcc
 FORTRAN_LIBRARY=/sw/lib/gcc4.3/lib/libgfortran.a
 
diff --git a/testsuite/makefiles/Makefile.one b/testsuite/makefiles/Makefile.one
index 608e044948..4921d7df10 100644
--- a/testsuite/makefiles/Makefile.one
+++ b/testsuite/makefiles/Makefile.one
@@ -10,10 +10,13 @@ ML_YACC_FILES=$(YACC_MODULES:=.ml)
 MLI_YACC_FILES=$(YACC_MODULES:=.mli)
 ML_FILES=$(ML_LEX_FILES) $(ML_YACC_FILES)
 O_FILES=$(C_FILES:=.o)
+ADD_CMO_FILES=$(ADD_MODULES:=.cmo)
+ADD_CMX_FILES=$(ADD_MODULES:=.cmx)
 
 GENERATED_SOURCES=$(ML_LEX_FILES) $(ML_YACC_FILES) $(MLI_YACC_FILES)
 
-ADD_CFLAGS+=`if [ -z $(C_FILES) ]; then true; else echo '-custom'; fi`
+CUSTOM_FLAG=`if [ -z "$(C_FILES)" ]; then true; else echo '-custom'; fi`
+ADD_CFLAGS+=$(CUSTOM_FLAG)
 
 default: compile run
 
@@ -21,8 +24,8 @@ compile: $(ML_FILES) $(CMO_FILES) $(CMX_FILES) $(MAIN_MODULE).cmo $(MAIN_MODULE)
 	@for file in $(C_FILES); do \
 	  $(NATIVECC) $(NATIVECCCOMPOPTS) -c -I$(TOPDIR)/byterun $$file.c; \
 	done;
-	@$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_MODULES:=.cmo) $(MAIN_MODULE).cmo
-	@$(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native $(O_FILES) $(CMXA_FILES) $(CMX_FILES) $(ADD_MODULES:=.cmx) $(MAIN_MODULE).cmx
+	@$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) $(MAIN_MODULE).cmo
+	@$(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native $(O_FILES) $(CMXA_FILES) $(CMX_FILES) $(ADD_CMX_FILES) $(MAIN_MODULE).cmx
 
 run:
 	@printf " ... testing with ocamlc"
diff --git a/testsuite/makefiles/Makefile.several b/testsuite/makefiles/Makefile.several
index 7681b6b6a9..6301e4cbe6 100644
--- a/testsuite/makefiles/Makefile.several
+++ b/testsuite/makefiles/Makefile.several
@@ -7,9 +7,12 @@ CMX_FILES=$(MODULES:=.cmx)
 CMA_FILES=$(LIBRARIES:=.cma)
 CMXA_FILES=$(LIBRARIES:=.cmxa)
 O_FILES=$(C_FILES:=.o)
-ADD_CFLAGS+=`if [ -z $(C_FILES) ]; then true; else echo '-custom'; fi`
-ADD_CFLAGS+=`if [ -z $(F_FILES) ]; then true; else echo '$(FORTRAN_LIBRARY)'; fi`
-ADD_OPTFLAGS+=`if [ -z $(F_FILES) ]; then true; else echo '$(FORTRAN_LIBRARY)'; fi`
+
+CUSTOM_FLAG=`if [ -z "$(C_FILES)" ]; then true; else echo '-custom'; fi`
+ADD_CFLAGS+=$(CUSTOM_FLAG)
+FORTRAN_LIB=`if [ -z "$(F_FILES)" ]; then true; else echo '$(FORTRAN_LIBRARY)'; fi`
+ADD_CFLAGS+=$(FORTRAN_LIB)
+ADD_OPTFLAGS+=$(FORTRAN_LIB)
 
 run-all:
 	@for file in $(C_FILES); do \
diff --git a/testsuite/tests/basic-io-2/Makefile b/testsuite/tests/basic-io-2/Makefile
index 74b861e7c7..9a7d2ba00e 100644
--- a/testsuite/tests/basic-io-2/Makefile
+++ b/testsuite/tests/basic-io-2/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=io
 EXEC_ARGS=io.ml
 
diff --git a/testsuite/tests/basic-io/Makefile b/testsuite/tests/basic-io/Makefile
index 9d645bed80..b0edfabbb0 100644
--- a/testsuite/tests/basic-io/Makefile
+++ b/testsuite/tests/basic-io/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=wc
 EXEC_ARGS=wc.ml
 
diff --git a/testsuite/tests/basic-manyargs/Makefile b/testsuite/tests/basic-manyargs/Makefile
index 476745893e..ef8a4f546b 100644
--- a/testsuite/tests/basic-manyargs/Makefile
+++ b/testsuite/tests/basic-manyargs/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=manyargs
 C_FILES=manyargsprim
 
diff --git a/testsuite/tests/gc-roots/Makefile b/testsuite/tests/gc-roots/Makefile
index 71082b9fe0..f07d6751ba 100644
--- a/testsuite/tests/gc-roots/Makefile
+++ b/testsuite/tests/gc-roots/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=globroots
 C_FILES=globrootsprim
 ADD_COMPFLAGS=-w a
diff --git a/testsuite/tests/lib-digest/Makefile b/testsuite/tests/lib-digest/Makefile
index 6d222274b3..e81a715ad1 100644
--- a/testsuite/tests/lib-digest/Makefile
+++ b/testsuite/tests/lib-digest/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=md5
 ADD_COMPFLAGS=-w a
 
diff --git a/testsuite/tests/lib-marshal/Makefile b/testsuite/tests/lib-marshal/Makefile
index 0d28b8d953..df63a1fd56 100644
--- a/testsuite/tests/lib-marshal/Makefile
+++ b/testsuite/tests/lib-marshal/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=intext
 C_FILES=intextaux
 
diff --git a/testsuite/tests/lib-scanf/Makefile b/testsuite/tests/lib-scanf/Makefile
index 0be4bf14e6..8f8b3c5b64 100644
--- a/testsuite/tests/lib-scanf/Makefile
+++ b/testsuite/tests/lib-scanf/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=tscanf
 ADD_COMPFLAGS=-I $(BASEDIR)/lib
 ADD_MODULES=testing
diff --git a/testsuite/tests/typing-fstclassmod/Makefile b/testsuite/tests/typing-fstclassmod/Makefile
index 68001d766f..a8a9622910 100644
--- a/testsuite/tests/typing-fstclassmod/Makefile
+++ b/testsuite/tests/typing-fstclassmod/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=fstclassmod
 ADD_COMPFLAGS=-w a
 
diff --git a/testsuite/tests/typing-typeparam/Makefile b/testsuite/tests/typing-typeparam/Makefile
index 6ac1ce1366..ef9558e19e 100644
--- a/testsuite/tests/typing-typeparam/Makefile
+++ b/testsuite/tests/typing-typeparam/Makefile
@@ -1,4 +1,4 @@
-MODULES=
+#MODULES=
 MAIN_MODULE=newtype
 ADD_COMPFLAGS=-w a