[llvm-commits] CVS: llvm-test/External/SPEC/Makefile Makefile.spec Makefile.spec2000 Makefile.spec95

[Reid Spencer]

Changes in directory llvm-test/External/SPEC:

Makefile updated: 1.13 -> 1.14
Makefile.spec updated: 1.36 -> 1.37
Makefile.spec2000 updated: 1.3 -> 1.4
Makefile.spec95 updated: 1.8 -> 1.9
---
Log message:

Adjust the makefiles for their new home.


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

Index: llvm-test/External/SPEC/Makefile
diff -u llvm-test/External/SPEC/Makefile:1.13 llvm-test/External/SPEC/Makefile:1.14
--- llvm-test/External/SPEC/Makefile:1.13	Sun Sep  5 14:54:37 2004
+++ llvm-test/External/SPEC/Makefile	Mon Sep  6 03:36:37 2004
@@ -1,6 +1,6 @@
 LEVEL = ../..
 PARALLEL_DIRS := CFP2000 CINT2000 CINT95
-include $(LEVEL)/../../Makefile.config
+#include $(LEVEL)/../../Makefile.config
 
 #
 # Remove SPEC95 and SPEC2000 per the user's configuration
@@ -14,4 +14,4 @@
 PARALLEL_DIRS := $(filter-out CINT95/, $(PARALLEL_DIRS))
 endif
 
-include $(LEVEL)/Makefile.programs
+include $(LEVEL)/External/Makefile.external


Index: llvm-test/External/SPEC/Makefile.spec
diff -u llvm-test/External/SPEC/Makefile.spec:1.36 llvm-test/External/SPEC/Makefile.spec:1.37
--- llvm-test/External/SPEC/Makefile.spec:1.36	Sun Sep  5 02:56:51 2004
+++ llvm-test/External/SPEC/Makefile.spec	Mon Sep  6 03:36:37 2004
@@ -5,7 +5,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/Makefile.config
+#include $(LEVEL)/Makefile.config
 
 ## Information the test should have provided...
 ifndef STDOUT_FILENAME
@@ -44,7 +44,7 @@
 LCXXFLAGS := -O3
 
 CPPFLAGS += -I $(SPEC_BENCH_DIR)/src/
-SPEC_SANDBOX := $(LLVM_SRC_ROOT)/External/SPEC/Sandbox.sh
+SPEC_SANDBOX := $(LEVEL)/External/SPEC/Sandbox.sh
 
 # Information about testing the program...
 REF_IN_DIR  := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/


Index: llvm-test/External/SPEC/Makefile.spec2000
diff -u llvm-test/External/SPEC/Makefile.spec2000:1.3 llvm-test/External/SPEC/Makefile.spec2000:1.4
--- llvm-test/External/SPEC/Makefile.spec2000:1.3	Wed Sep  1 09:33:19 2004
+++ llvm-test/External/SPEC/Makefile.spec2000	Mon Sep  6 03:36:37 2004
@@ -4,7 +4,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/Makefile.config
+#include $(LEVEL)/Makefile.config
 
 SPEC_ROOT := $(SPEC2000_ROOT)
 CPPFLAGS += -DSPEC_CPU2000


Index: llvm-test/External/SPEC/Makefile.spec95
diff -u llvm-test/External/SPEC/Makefile.spec95:1.8 llvm-test/External/SPEC/Makefile.spec95:1.9
--- llvm-test/External/SPEC/Makefile.spec95:1.8	Wed Sep  1 09:33:19 2004
+++ llvm-test/External/SPEC/Makefile.spec95	Mon Sep  6 03:36:37 2004
@@ -4,7 +4,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/Makefile.config
+#include $(LEVEL)/Makefile.config
 
 SPEC_ROOT := $(SPEC95_ROOT)
 CPPFLAGS += -DSPEC_CPU95