[llvm-commits] CVS: llvm-test/Makefile.dummylib Makefile.programs

[Misha Brukman]

Changes in directory llvm-test:

Makefile.dummylib updated: 1.5 -> 1.6
Makefile.programs updated: 1.136 -> 1.137
---
Log message:

Instead of $(LEVEL), refer to $(LLVM_{SRC,OBJ}_ROOT) to be consistent
$(LEVEL) in llvm-test refers to top of llvm-test tree


---
Diffs of the changes:  (+4 -4)

Index: llvm-test/Makefile.dummylib
diff -u llvm-test/Makefile.dummylib:1.5 llvm-test/Makefile.dummylib:1.6
--- llvm-test/Makefile.dummylib:1.5	Sun Sep  5 02:56:51 2004
+++ llvm-test/Makefile.dummylib	Mon Sep 20 13:39:32 2004
@@ -10,7 +10,7 @@
 # external functions for dsanalysis.
 #
 DUMMYLIB := $(DESTLIBBYTECODE)/libdummy.bc
-DUMMYSRC := $(LEVEL)/runtime/libdummy
+DUMMYSRC := $(LLVM_SRC_ROOT)/runtime/libdummy
 
 # Rebuild dummylib if necessary...
 $(DUMMYLIB) : $(wildcard $(DUMMYSRC)/*.c)


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.136 llvm-test/Makefile.programs:1.137
--- llvm-test/Makefile.programs:1.136	Sun Sep  5 02:56:51 2004
+++ llvm-test/Makefile.programs	Mon Sep 20 13:39:32 2004
@@ -401,7 +401,7 @@
 	$(LBUGPOINT) $< -run-jit $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
 
 
-LIBPROFILESO = $(LEVEL)/lib/Debug/libprofile_rt.so
+LIBPROFILESO = $(LLVM_OBJ_ROOT)/lib/Debug/libprofile_rt.so
 
 $(PROGRAMS_TO_TEST:%=Output/%.prof): \
 Output/%.prof: Output/%.llvm-prof.bc Output/%.out-nat $(LIBPROFILESO)
@@ -529,7 +529,7 @@
 # AVAILABLE_TESTS - Compute the set of tests available for user help
 #
 TEST_FILES = $(wildcard $(PROGDIR)/TEST.*.Makefile) \
-             $(wildcard $(LEVEL)/projects/*/test/TEST.*.Makefile)
+             $(wildcard $(LLVM_SRC_ROOT)/projects/*/test/TEST.*.Makefile)
 AVAILABLE_TESTS = $(patsubst TEST.%.Makefile,%,$(notdir $(TEST_FILES)))
 
 # If they just say 'make test' then we print out an error telling the user to
@@ -551,7 +551,7 @@
 #
 ifdef TEST
 TestMakefile := $(wildcard $(PROGDIR)/TEST.$(TEST).Makefile) \
-                $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).Makefile)
+                $(wildcard $(LLVM_SRC_ROOT)/projects/*/test/TEST.$(TEST).Makefile)
 TestReport   := $(wildcard $(PROGDIR)/TEST.$(TEST).report) \
                 $(wildcard $(BUILD_SRC_ROOT)/projects/*/test/TEST.$(TEST).report)
 TestGnuPlot  := $(wildcard $(PROGDIR)/TEST.$(TEST).gnuplot) \