summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2012-01-17 02:56:49 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2012-01-17 02:56:49 +0000
commitf214b80b8d9c87574dd0c99d54d3c79e13b60b0b (patch)
tree6da7eedb8ff97d361f56301c1fa2838a6adf3d98
parentf57e1c29dde4666ea4ec397dde72f991e5b9f854 (diff)
Makefile: add missing files to FilesToConfig
And fix the comment about where the FilesToConfig variable is. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148282 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile11
-rw-r--r--autoconf/configure.ac2
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 35fa00fb93c..ec24862ad6f 100644
--- a/Makefile
+++ b/Makefile
@@ -175,11 +175,18 @@ all-local:: clean-diagnostics
endif
#------------------------------------------------------------------------
-# Make sure the generated headers are up-to-date. This must be kept in
-# sync with the AC_CONFIG_HEADER invocations in autoconf/configure.ac
+# Make sure the generated files are up-to-date. This must be kept in
+# sync with the AC_CONFIG_HEADER and AC_CONFIG_FILE invocations in
+# autoconf/configure.ac.
+# Note that Makefile.config is covered by its own separate rule
+# in Makefile.rules where it can be reused by sub-projects.
#------------------------------------------------------------------------
FilesToConfig := \
+ bindings/ocaml/llvm/META.llvm \
+ docs/doxygen.cfg \
+ llvm.spec \
include/llvm/Config/config.h \
+ include/llvm/Config/llvm-config.h \
include/llvm/Config/Targets.def \
include/llvm/Config/AsmPrinters.def \
include/llvm/Config/AsmParsers.def \
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 646d9a85910..9d5c6f5f16f 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1564,7 +1564,7 @@ dnl===-----------------------------------------------------------------------===
dnl Configure header files
dnl WARNING: dnl If you add or remove any of the following config headers, then
-dnl you MUST also update Makefile.rules so that the variable FilesToConfig
+dnl you MUST also update Makefile so that the variable FilesToConfig
dnl contains the same list of files as AC_CONFIG_HEADERS below. This ensures the
dnl files can be updated automatically when their *.in sources change.
AC_CONFIG_HEADERS([include/llvm/Config/config.h include/llvm/Config/llvm-config.h])