1) Include files for NG were neither recursively processes nor accumulated.

[helm.git] / helm / software / components / binaries / table_creator / Makefile

diff --git a/helm/software/components/binaries/table_creator/Makefile b/helm/software/components/binaries/table_creator/Makefile
index 15cf1863aaf08ce65a1b61603061d4616790ddf7..d5889699f46545bc452ef9f3c9d65a8d3b3414f0 100644 (file)
--- a/helm/software/components/binaries/table_creator/Makefile
+++ b/helm/software/components/binaries/table_creator/Makefile
@@ -16,7 +16,7 @@ opt: table_creator.opt table_destructor.opt
 table_creator: table_creator.ml 
        $(H)echo "    OCAMLC $<"
        $(H)$(OCAMLFIND) ocamlc \
-               -thread -package mysql,helm-metadata -linkpkg -o $@ $<
+               -thread -package mysql,helm-metadata -linkpkg -rectypes -o $@ $<
 
 table_destructor: table_creator
        $(H)ln -f $< $@
@@ -24,7 +24,7 @@ table_destructor: table_creator
 table_creator.opt: table_creator.ml
        $(H)echo "    OCAMLOPT $<"
        $(H)$(OCAMLFIND) ocamlopt \
-               -thread -package mysql,helm-metadata -linkpkg -o $@ $<
+               -thread -package mysql,helm-metadata -linkpkg -rectypes -o $@ $<
 
 table_destructor.opt: table_creator.opt
        $(H)ln  -f $< $@
@@ -39,7 +39,18 @@ depend:
        $(H)ocamldep table_creator.ml > .depend
 depend.opt: 
        $(H)echo "  OCAMLDEP -native"
-       $(H)ocamldep -native table_creator.ml > .depend
+       $(H)ocamldep -native table_creator.ml > .depend.opt
+
+ifeq ($(MAKECMDGOALS),)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), all)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), opt)
+  include .depend.opt   
+endif
 
-include .depend
 include ../../../Makefile.defs