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

[Chris Lattner]

Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.27 -> 1.28

---
Log message:

Make things work better for SPEC


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.27 llvm/test/Programs/MultiSource/Makefile.multisrc:1.28
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.27	Tue May  6 14:03:22 2003
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Sat May 17 17:33:04 2003
@@ -23,16 +23,19 @@
 include $(LEVEL)/test/Programs/Makefile.programs
 
 # Figure out what object files we want to build...
-LObjs    := $(sort $(addsuffix .rbc, $(basename $(Source))))
+LObjs    := $(sort $(addsuffix .rbc, $(notdir $(basename $(Source)))))
 LObjects := $(addprefix Output/,$(LObjs))
 
-NObjs    := $(sort $(addsuffix .o, $(basename $(Source))))
+NObjs    := $(sort $(addsuffix .o, $(notdir $(basename $(Source)))))
 NObjects := $(addprefix Output/,$(NObjs))
 
 .PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
 
-Output/%.o: %.c Output/.dir
+Output/%.o: $(SourceDir)%.c Output/.dir
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+Output/%.o: $(SourceDir)%.cpp Output/.dir
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
 bugpoint-gccas: Output/$(PROG).bugpoint-gccas
 bugpoint-gccld: Output/$(PROG).bugpoint-gccld