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

[Misha Brukman]

Changes in directory llvm-tv:

Makefile.common.in updated: 1.1 -> 1.2
Makefile.config.in updated: 1.1 -> 1.2
---
Log message:

Makefile.common should not define any variables, it should just source in
Makefile.config and Makefile.rules (from LLVM)


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

Index: llvm-tv/Makefile.common.in
diff -u llvm-tv/Makefile.common.in:1.1 llvm-tv/Makefile.common.in:1.2
--- llvm-tv/Makefile.common.in:1.1	Wed Mar 31 16:50:50 2004
+++ llvm-tv/Makefile.common.in	Tue Oct  5 16:39:44 2004
@@ -1,25 +1,16 @@
+#===-- Makefile.common - Common make rules for LLVM-TV -----*- Makefile -*--===#
+# 
+#                     The LLVM Compiler Infrastructure
 #
-# Set this variable to the top of the LLVM source tree.
-#
-LLVM_SRC_ROOT = @LLVM_SRC@
+# This file was developed by the LLVM research group and is distributed under
+# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 
 #
-# Set this variable to the top level directory where LLVM was built
-# (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
-#
-LLVM_OBJ_ROOT = @LLVM_OBJ@
-
-#
-# Include LLVM's Master Makefile.
+# Include the local config file
 #
-include $(LLVM_OBJ_ROOT)/Makefile.config
-
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
-
-BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+include $(LEVEL)/Makefile.config
 
 #
 # Include LLVM's Master Makefile.


Index: llvm-tv/Makefile.config.in
diff -u llvm-tv/Makefile.config.in:1.1 llvm-tv/Makefile.config.in:1.2
--- llvm-tv/Makefile.config.in:1.1	Wed Mar 31 16:50:50 2004
+++ llvm-tv/Makefile.config.in	Tue Oct  5 16:39:44 2004
@@ -12,5 +12,12 @@
 #
 # Include LLVM's Makefile Makefile.
 #
-include $(LLVM_SRC_ROOT)/Makefile.config
+include $(LLVM_OBJ_ROOT)/Makefile.config
+
+#
+# Set the source root and source directory pathnames
+#
+BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+
+BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)