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

[John Criswell]

Changes in directory llvm/projects/sample:

Makefile.common updated: 1.1.2.1 -> 1.1.2.2
Makefile.config updated: 1.1.2.1 -> 1.1.2.2

---
Log message:

Modified the Makefile's so that they can be used within the source tree
without modification, and yet are simple enough to configure for use outside
the source tree.


---
Diffs of the changes:

Index: llvm/projects/sample/Makefile.common
diff -u llvm/projects/sample/Makefile.common:1.1.2.1 llvm/projects/sample/Makefile.common:1.1.2.2
--- llvm/projects/sample/Makefile.common:1.1.2.1	Mon Jun 30 13:45:05 2003
+++ llvm/projects/sample/Makefile.common	Mon Jun 30 15:47:33 2003
@@ -1,16 +1,16 @@
 #
 # Set this variable to the top of the LLVM source tree.
 #
-LLVM_SRC_ROOT = /home/vadve/$(USER)/box/conf/llvm
+LLVM_SRC_ROOT = $(LEVEL)/../..
 
 #
 # 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 = /localhome/$(USER)/box/conf/llvm/
+#LLVM_OBJ_ROOT = $(LEVEL)/../..
 
 #
-# Include LLVM's Makefile Makefile.
+# Include LLVM's Master Makefile.
 #
 include $(LLVM_SRC_ROOT)/Makefile.common
 


Index: llvm/projects/sample/Makefile.config
diff -u llvm/projects/sample/Makefile.config:1.1.2.1 llvm/projects/sample/Makefile.config:1.1.2.2
--- llvm/projects/sample/Makefile.config:1.1.2.1	Mon Jun 30 13:45:05 2003
+++ llvm/projects/sample/Makefile.config	Mon Jun 30 15:47:33 2003
@@ -1,13 +1,13 @@
 #
 # Set this variable to the top of the LLVM source tree.
 #
-LLVM_SRC_ROOT = /home/vadve/$(USER)/box/conf/llvm
+LLVM_SRC_ROOT = $(LEVEL)/../..
 
 #
 # Set this variable to the top level directory where LLVM was built
 # (i.e. where all of the object files are located).
 #
-LLVM_OBJ_ROOT = /localhome/$(USER)/box/conf/llvm/
+#LLVM_OBJ_ROOT = $(LEVEL)/../..
 
 #
 # Include LLVM's Makefile Makefile.