Fixed SPEC so that it would run correctly with the new autoconf-style object

directory.
Cleaned up the Makefile so that it uses VPATH to find source files.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8477 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 7b18402e366abdb6fb95e535ac3496cf1f8a2a59..3bdea41f890088ad7e6db3e5827237eaadb2922c 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -85,23 +85,14 @@ clean::
        $(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll
-Output/%.ll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
-       $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
-
 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
        $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
 # Compile from X.cpp to Output/X.ll
-Output/%.ll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
-
 Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # Compile from X.cc to Output/X.ll
-Output/%.ll: $(SourceDir)/%.cc $(LCC1XX) Output/.dir $(INCLUDES)
-       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
-
 Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
@@ -114,27 +105,17 @@ Output/%.bc: Output/%.ll $(LGCCAS)
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.
 #
-Output/%.bc: $(SourceDir)/%.ll $(LAS) Output/.dir
+Output/%.bc: %.ll $(LAS) Output/.dir
        $(LAS) -f $< -o $@
 
 #
 # Testing versions of provided utilities...
 #
-Output/%.tll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
-       @echo "======== Compiling $<"
-       $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
-           ( rm -f $@; $(FAILURE) $@ )
-
 Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
        @echo "======== Compiling $<"
        $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
            ( rm -f $@; $(FAILURE) $@ )
 
-Output/%.tll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-       @echo "======== Compiling $<"
-       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
-           ( rm -f $@; $(FAILURE) $@ )
-
 Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
        @echo "======== Compiling $<"
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \