[llvm-commits] CVS: llvm/test/Programs/MultiSource/Makefile.multisrc

John Criswell criswell at cs.uiuc.edu
Thu Sep 11 13:05:41 PDT 2003


Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.36 -> 1.37

---
Log message:

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.



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.36 llvm/test/Programs/MultiSource/Makefile.multisrc:1.37
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.36	Sat Sep  6 10:13:08 2003
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Thu Sep 11 13:04:30 2003
@@ -31,15 +31,6 @@
 
 .PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
 
-Output/%.o: $(SourceDir)/%.c Output/.dir
-	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
-
-Output/%.o: $(SourceDir)/%.cpp Output/.dir
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
-
-Output/%.o: $(SourceDir)/%.cc Output/.dir
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
-
 Output/%.o: %.c Output/.dir
 	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
 
@@ -71,7 +62,7 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \
 Output/%.LOC.txt: $(Source)
-	cat $(Source) $(wildcard $(SourceDir)/*.h) | wc -l > $@
+	cat $^ $(wildcard $(SourceDir)/*.h) | wc -l > $@
 
 endif
 





More information about the llvm-commits mailing list