summaryrefslogtreecommitdiffstats
path: root/llvm
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
commitc120957339e4bda15f9606ab95bcb7f3b20746b4 (patch)
tree3443e0c1ab01949786d78fb6d23e9a439f2ba184 /llvm
parentf47fa304a4ee7ab0db34210b7043743cc4dd3b8b (diff)
downloadbcm5719-llvm-c120957339e4bda15f9606ab95bcb7f3b20746b4.tar.gz
bcm5719-llvm-c120957339e4bda15f9606ab95bcb7f3b20746b4.zip
Makefile: add missing files to FilesToConfig
And fix the comment about where the FilesToConfig variable is. llvm-svn: 148282
Diffstat (limited to 'llvm')
-rw-r--r--llvm/Makefile11
-rw-r--r--llvm/autoconf/configure.ac2
2 files changed, 10 insertions, 3 deletions
diff --git a/llvm/Makefile b/llvm/Makefile
index 35fa00fb93c..ec24862ad6f 100644
--- a/llvm/Makefile
+++ b/llvm/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/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 646d9a85910..9d5c6f5f16f 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/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])
OpenPOWER on IntegriCloud