Introduce config.generated.ml

This is the fragment of the configure module which is presently generated
at build time from a template file but will ultimately be generated
at configure time.

Also make .gitignore more specific and explicit about what needs
to be ignored.

5 files changed, 20 insertions, 7 deletions

diff --git a/.depend b/.depend
index 1d3de115ff..a514bc4251 100644
--- a/.depend
+++ b/.depend
@@ -49,6 +49,8 @@ utils/config.common.cmo :
 utils/config.common.cmx :
 utils/config.fixed.cmo :
 utils/config.fixed.cmx :
+utils/config.generated.cmo :
+utils/config.generated.cmx :
 utils/config.cmo : \
     utils/config.cmi
 utils/config.cmx : \
diff --git a/.gitignore b/.gitignore
index 5b49c11b06..fafb609da0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -249,7 +249,11 @@ META
 /toplevel/native/trace.mli
 /toplevel/native/topmain.mli
 
-/utils/config_*.ml*
+/utils/config_boot.ml
+/utils/config_boot.mli
+/utils/config.generated.ml
+/utils/config_main.ml
+/utils/config_main.mli
 /utils/config.ml
 /utils/domainstate.ml
 /utils/domainstate.mli
diff --git a/Makefile b/Makefile
index 32c5d39387..5c890317b3 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ CONFIG_MODULE_DEPENDENCIES = \
 utils/config.ml: utils/config_main.ml utils/config_boot.ml
 	$(MAKE) -C utils config.ml
 
-utils/config_main.ml: utils/config.mlp $(CONFIG_MODULE_DEPENDENCIES)
+utils/config_main.ml: utils/config.generated.mlp $(CONFIG_MODULE_DEPENDENCIES)
 	$(MAKE) -C utils config_main.ml
 
 utils/config_boot.ml: utils/config.fixed.ml $(CONFIG_MODULE_DEPENDENCIES)
@@ -112,8 +112,9 @@ configure: configure.ac aclocal.m4 build-aux/ocaml_version.m4 tools/autogen
 
 .PHONY: partialclean
 partialclean::
-	rm -f utils/config.ml utils/config_main.ml utils/config_main.mli \
-        utils/config_boot.ml utils/config_boot.mli \
+	rm -f utils/config.ml utils/config.generated.ml \
+	utils/config_main.ml utils/config_main.mli \
+	utils/config_boot.ml utils/config_boot.mli \
         utils/domainstate.ml utils/domainstate.mli
 
 .PHONY: beforedepend
diff --git a/utils/Makefile b/utils/Makefile
index ba5c70ae05..c2b819e300 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -33,7 +33,7 @@ prefix_and_quote = $(if $(1), $(2)$(if $(word 2,$(1)),"$(1)",$(1)))
 FLEXLINK_LDFLAGS = $(call prefix_and_quote,$(OC_LDFLAGS),-link $(EMPTY))
 FLEXLINK_DLL_LDFLAGS = $(call prefix_and_quote,$(OC_DLL_LDFLAGS),-link $(EMPTY))
 
-config_main.ml: config.mlp $(ROOTDIR)/Makefile.config Makefile config.common.ml
+config.generated.ml: config.generated.mlp
 	sed $(call SUBST,AFL_INSTRUMENT) \
 	    $(call SUBST,ARCH) \
 	    $(call SUBST_STRING,ARCMD) \
@@ -85,7 +85,10 @@ config_main.ml: config.mlp $(ROOTDIR)/Makefile.config Makefile config.common.ml
 	    $(call SUBST,AS_HAS_DEBUG_PREFIX_MAP) \
 	    $(call SUBST,FORCE_INSTRUMENTED_RUNTIME) \
 	    $< > $@
-	cat config.common.ml >> $@
+
+config_main.ml: \
+  config.generated.ml $(ROOTDIR)/Makefile.config Makefile config.common.ml
+	cat config.generated.ml config.common.ml > $@
 
 config_boot.ml: config.fixed.ml config.common.ml Makefile
 	cat config.fixed.ml config.common.ml > $@
diff --git a/utils/config.mlp b/utils/config.generated.mlp
index cb0ead0844..014eda356a 100644
--- a/utils/config.mlp
+++ b/utils/config.generated.mlp
@@ -1,4 +1,4 @@
-#2 "utils/config.mlp"
+#2 "utils/config.generated.mlp"
 (**************************************************************************)
 (*                                                                        *)
 (*                                 OCaml                                  *)
@@ -14,6 +14,9 @@
 (*                                                                        *)
 (**************************************************************************)
 
+(* This file is included in config_main.ml during the build rather
+   than compiled on its own *)
+
 let bindir = "%%BINDIR%%"
 
 let standard_library_default = "%%LIBDIR%%"