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

[John Criswell]

Changes in directory llvm-test:

Makefile updated: 1.22 -> 1.23
Makefile.programs updated: 1.134 -> 1.135
Makefile.tests updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.


---
Diffs of the changes:  (+23 -32)

Index: llvm-test/Makefile
diff -u llvm-test/Makefile:1.22 llvm-test/Makefile:1.23
--- llvm-test/Makefile:1.22	Tue Dec  2 09:40:28 2003
+++ llvm-test/Makefile	Wed Sep  1 09:33:16 2004
@@ -1,12 +1,27 @@
-##===- test/Programs/Makefile ------------------------------*- Makefile -*-===##
-#
-# This recursively traverses the programs, building them as necessary.  This
-# makefile also implements 'make report TEST=<x>'.
+##===- projects/ModuleMaker/Makefile -----------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
 #
+# 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.
+# 
 ##===----------------------------------------------------------------------===##
+#
+# This is a sample Makefile for a project that uses LLVM.
+#
+
+#
+# Indicates our relative path to the top of the project's root directory.
+#
+LEVEL = .
 
-LEVEL = ../..
+#
+# Directories that needs to be built.
+#
 PARALLEL_DIRS = SingleSource MultiSource External
 
-include ${LEVEL}/test/Programs/Makefile.programs
+#
+# Include the Master Makefile that knows how to build all.
+#
+include $(LEVEL)/Makefile.common
 


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.134 llvm-test/Makefile.programs:1.135
--- llvm-test/Makefile.programs:1.134	Tue Aug 17 14:36:21 2004
+++ llvm-test/Makefile.programs	Wed Sep  1 09:33:16 2004
@@ -40,13 +40,13 @@
 # we do not automatically compute dependencies
 INCLUDES := $(ExtraHeaders) $(wildcard $(SourceDir)/*.h)
 
-include $(LEVEL)/test/Programs/Makefile.tests
+include $(LEVEL)/Makefile.tests
 
 .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s
 .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc
 .PRECIOUS: Output/%.linked.bc 
 
-PROGDIR = $(LLVM_SRC_ROOT)/test/Programs
+PROGDIR = $(BUILD_SRC_ROOT)
 
 #
 # Scripts in the Programs directory...
@@ -604,11 +604,3 @@
 
 clean::
 	rm -f report.*.raw.out report.*.txt report.*.html report.*.tex
-
-# If the Makefile in the source tree has been updated, copy it over into the
-# build tree.
-Makefile :: $(BUILD_SRC_DIR)/Makefile
-	@${ECHO} "===== Updating Makefile from source dir: `dirname $<` ====="
-	$(MKDIR) $(@D)
-	cp -f $< $@
-


Index: llvm-test/Makefile.tests
diff -u llvm-test/Makefile.tests:1.2 llvm-test/Makefile.tests:1.3
--- llvm-test/Makefile.tests:1.2	Tue Aug  3 10:48:21 2004
+++ llvm-test/Makefile.tests	Wed Sep  1 09:33:16 2004
@@ -34,22 +34,6 @@
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-# Find the location of the platform specific LLVM GCC libraries
-LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
-
-# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
-LLC      = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
-LGCCAS   = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
-LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib \
-                         -L$(LLVMGCCDIR)/bytecode-libs
-LDIS     = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
-LOPT     = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
-LLINK    = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
-LPROF    = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
-LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
-LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
-
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =