[llvm-commits] CVS: llvm-tv/Makefile.config.in

[Misha Brukman]

Changes in directory llvm-tv:

Makefile.config.in updated: 1.2 -> 1.3
---
Log message:

The directory settings for projects have changed in the LLVM build system


---
Diffs of the changes:  (+17 -10)

 Makefile.config.in |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)


Index: llvm-tv/Makefile.config.in
diff -u llvm-tv/Makefile.config.in:1.2 llvm-tv/Makefile.config.in:1.3
--- llvm-tv/Makefile.config.in:1.2	Tue Oct  5 16:39:44 2004
+++ llvm-tv/Makefile.config.in	Mon Apr 18 13:39:39 2005
@@ -1,3 +1,6 @@
+PROJECT_NAME = @PACKAGE_NAME@
+PROJ_VERSION = @PACKAGE_VERSION@
+
 #
 # Set this variable to the top of the LLVM source tree.
 #
@@ -5,19 +8,23 @@
 
 #
 # Set this variable to the top level directory where LLVM was built
-# (i.e. where all of the object files are located).
+# (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
 #
 LLVM_OBJ_ROOT = @LLVM_OBJ@
 
-#
-# Include LLVM's Makefile Makefile.
-#
-include $(LLVM_OBJ_ROOT)/Makefile.config
+# Set the directory root of this project's source files
+PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
 
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
 
-BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+# Set the root directory of this project's install prefix
+PROJ_INSTALL_ROOT := @prefix@
+
+# Include LLVM's Master Makefile.
+include $(LLVM_OBJ_ROOT)/Makefile.config
 
+#Set SourceDir for backwards compatbility.
+ifndef SourceDir
+SourceDir=$(PROJ_SRC_DIR)
+endif