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

[Misha Brukman]

Changes in directory llvm-test/External/SPEC:

Makefile updated: 1.15 -> 1.16
Makefile.spec updated: 1.39 -> 1.40
Makefile.spec2000 updated: 1.5 -> 1.6
Makefile.spec95 updated: 1.9 -> 1.10
---
Log message:

Revert Makefile structure back to what it used to be, since Makefile.config is
generated in top-level testing directory.


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

Index: llvm-test/External/SPEC/Makefile
diff -u llvm-test/External/SPEC/Makefile:1.15 llvm-test/External/SPEC/Makefile:1.16
--- llvm-test/External/SPEC/Makefile:1.15	Mon Sep  6 18:21:40 2004
+++ llvm-test/External/SPEC/Makefile	Mon Sep  6 22:36:04 2004
@@ -1,6 +1,6 @@
 LEVEL = ../..
 PARALLEL_DIRS := CFP2000 CINT2000 CINT95
-include $(LLVM_OBJ_ROOT)/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)/External/Makefile.external
+include $(LEVEL)/Makefile.programs


Index: llvm-test/External/SPEC/Makefile.spec
diff -u llvm-test/External/SPEC/Makefile.spec:1.39 llvm-test/External/SPEC/Makefile.spec:1.40
--- llvm-test/External/SPEC/Makefile.spec:1.39	Mon Sep  6 18:46:05 2004
+++ llvm-test/External/SPEC/Makefile.spec	Mon Sep  6 22:36:04 2004
@@ -5,8 +5,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/Makefile.common
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.config
 
 ## Information the test should have provided...
 ifndef STDOUT_FILENAME


Index: llvm-test/External/SPEC/Makefile.spec2000
diff -u llvm-test/External/SPEC/Makefile.spec2000:1.5 llvm-test/External/SPEC/Makefile.spec2000:1.6
--- llvm-test/External/SPEC/Makefile.spec2000:1.5	Mon Sep  6 18:43:37 2004
+++ llvm-test/External/SPEC/Makefile.spec2000	Mon Sep  6 22:36:04 2004
@@ -4,7 +4,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/Makefile.common
+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.9 llvm-test/External/SPEC/Makefile.spec95:1.10
--- llvm-test/External/SPEC/Makefile.spec95:1.9	Mon Sep  6 03:36:37 2004
+++ llvm-test/External/SPEC/Makefile.spec95	Mon Sep  6 22:36:04 2004
@@ -4,7 +4,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-#include $(LEVEL)/Makefile.config
+include $(LEVEL)/Makefile.config
 
 SPEC_ROOT := $(SPEC95_ROOT)
 CPPFLAGS += -DSPEC_CPU95