From 3f8e863e7d04aea76f4cf7ffd83416e6a70a1179 Mon Sep 17 00:00:00 2001 From: Dylan Noblesmith Date: Tue, 17 Jan 2012 02:56:49 +0000 Subject: [PATCH] Makefile: add missing files to FilesToConfig And fix the comment about where the FilesToConfig variable is. llvm-svn: 148282 --- Makefile | 11 +++++++++-- autoconf/configure.ac | 2 +- 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])