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

[Chris Lattner]

Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.21 -> 1.22

---
Log message:

Unify building processes between multisrc and singlesrc makefiles



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.21 llvm/test/Programs/MultiSource/Makefile.multisrc:1.22
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.21	Fri Jan 17 11:48:00 2003
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Tue Jan 21 15:32:01 2003
@@ -29,8 +29,7 @@
 NObjs    := $(sort $(addsuffix .o, $(basename $(Source))))
 NObjects := $(addprefix Output/,$(NObjs))
 
-.PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.bc
-.PRECIOUS: Output/%.linked.rbc Output/%.linked.rll
+.PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
 
 Output/%.o: %.c Output/.dir
 	$(CC) $(CPPFLAGS) -O $(CFLAGS) -c $< -o $@
@@ -42,26 +41,11 @@
 	$(LAS) -f $< -o $@
 
 
-# Output/*.linked.bc is all of the bytecode files of the program linked together
+# Output/*.linked.ll is all of the bytecode files of the program linked together
 # without any libraries linked in...
 #
-Output/%.linked.rbc: $(LObjects)
-	$(LLINK) -f $(LObjects) | opt -funcresolve > $@
-
-Output/%.linked.rll: Output/%.linked.rbc $(LDIS)
-	$(LDIS) -f $< -o $@
-
-Output/%.linked.bc: Output/%.linked.rll $(LGCCAS)
-	$(LGCCAS) $(STATS) $< -o $@
-
-ifndef USE_PRECOMPILED_BYTECODE
-
-# Link the program to the libraries it uses, then perform postlink
-# optimization...
-Output/%.llvm Output/%.llvm.bc: Output/%.linked.bc
-	$(LGCCLD) $(STATS) $< -lgcc -lc $(LIBS) -o Output/$*.llvm
-
-endif
+Output/%.linked.rll: $(LObjects) $(LLINK) $(LOPT) $(LDIS)
+	$(LLINK) -f $(LObjects) | $(LOPT) -funcresolve | $(LDIS) > $@
 
 Output/%.native: $(NObjects)
 	$(CC) -o $@ $(NObjects) $(LDFLAGS) $(CFLAGS)