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

[John Criswell]

Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.35 -> 1.36

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.35 llvm/test/Programs/MultiSource/Makefile.multisrc:1.36
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.35	Sun Aug 17 23:33:15 2003
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Sat Sep  6 10:13:08 2003
@@ -31,13 +31,22 @@
 
 .PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
 
-Output/%.o: $(SourceDir)%.c Output/.dir
+Output/%.o: $(SourceDir)/%.c Output/.dir
 	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
 
-Output/%.o: $(SourceDir)%.cpp Output/.dir
+Output/%.o: $(SourceDir)/%.cpp Output/.dir
 	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
 
-Output/%.o: $(SourceDir)%.cc Output/.dir
+Output/%.o: $(SourceDir)/%.cc Output/.dir
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
+
+Output/%.o: %.c Output/.dir
+	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
+
+Output/%.o: %.cpp Output/.dir
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
+
+Output/%.o: %.cc Output/.dir
 	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
 
 bugpoint-gccas: Output/$(PROG).bugpoint-gccas