[llvm-commits] CVS: llvm/projects/sample/Makefile Makefile.common

[John Criswell]

Changes in directory llvm/projects/sample:

Makefile updated: 1.3 -> 1.4
Makefile.common updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.
Modified Makefiles to use the new Makefile setup in LLVM.


---
Diffs of the changes:

Index: llvm/projects/sample/Makefile
diff -u llvm/projects/sample/Makefile:1.3 llvm/projects/sample/Makefile:1.4
--- llvm/projects/sample/Makefile:1.3	Wed Jul 23 18:28:57 2003
+++ llvm/projects/sample/Makefile	Sat Sep  6 10:03:24 2003
@@ -10,7 +10,7 @@
 #
 # Directories that needs to be built.
 #
-#DIRS = lib tools
+DIRS = lib tools
 
 #
 # Include the Master Makefile that knows how to build all.


Index: llvm/projects/sample/Makefile.common
diff -u llvm/projects/sample/Makefile.common:1.3 llvm/projects/sample/Makefile.common:1.4
--- llvm/projects/sample/Makefile.common:1.3	Thu Aug 21 17:22:24 2003
+++ llvm/projects/sample/Makefile.common	Sat Sep  6 10:03:24 2003
@@ -1,10 +1,23 @@
 #
-# Set this variable to the top of the LLVM source tree.
+# Configure the location of the LLVM object root.  We know it is two
+# directories up.  The source tree location we do not know; let the LLVM
+# Makefiles find it for us.
 #
-LLVM_SRC_ROOT = $(LEVEL)/../..
+LLVM_OBJ_ROOT=$(LEVEL)/../..
 
 #
-# Include LLVM's Master Makefile.
+# Grab the LLVM configuration file.
 #
-include $(LLVM_SRC_ROOT)/Makefile.common
+include $(LEVEL)/../../Makefile.config
+
+#
+# Reconfigure the source directories
+#
+BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/sample
+BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+
+#
+# Include LLVM's build rules.
+#
+include $(LLVM_SRC_ROOT)/Makefile.rules