# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1223800974 -7200
# Node ID f1560a529987851bbf2b965e9432ded6764ac9f1
# Parent  b411c41a971612606730ecbe7a94279ca83511dc
Updates to makefiles. It's not robust with regard to the .bc files, but it works.

diff -r b411c41a9716 -r f1560a529987 runtime/internal/ldc.mak
--- a/runtime/internal/ldc.mak	Sun Oct 12 10:35:16 2008 +0200
+++ b/runtime/internal/ldc.mak	Sun Oct 12 10:42:54 2008 +0200
@@ -57,9 +57,6 @@
 	g++ -c $(CFLAGS) $< -o$@
 
 .d.o:
-	$(DC) -c $(DFLAGS) $< -of$@
-
-.d.bc:
 	$(DC) -c $(DFLAGS) $< -of$@ -output-bc
 
 .d.html:
@@ -67,7 +64,7 @@
 
 targets : lib sharedlib doc
 all     : lib sharedlib doc
-lib     : ldc.lib ldc.bclib ldc.clib
+lib     : ldc.bclib ldc.clib ldc.lib
 sharedlib : ldc.sharedlib
 doc     : ldc.doc
 
@@ -226,7 +223,7 @@
 ldc.lib : $(LIB_TARGET_FULL)
 ldc.sharedlib : $(LIB_TARGET_SHARED)
 
-$(LIB_TARGET_BC_ONLY) : $(ALL_OBJS_BC)
+$(LIB_TARGET_BC_ONLY) : $(ALL_OBJS_O)
 	$(RM) $@
 	$(LC) $@ $(ALL_OBJS_BC)
 
@@ -253,8 +250,8 @@
 
 clean :
 	find . -name "*.di" | xargs $(RM)
-	$(RM) $(ALL_OBJS)
-	$(RM) $(OBJ_C)
+	$(RM) $(ALL_OBJS_BC)
+	$(RM) $(ALL_OBJS_O)
 	$(RM) $(ALL_DOCS)
 	$(RM) $(LIB_MASK)
 
diff -r b411c41a9716 -r f1560a529987 runtime/lib/common/tango/ldc.mak
--- a/runtime/lib/common/tango/ldc.mak	Sun Oct 12 10:35:16 2008 +0200
+++ b/runtime/lib/common/tango/ldc.mak	Sun Oct 12 10:42:54 2008 +0200
@@ -61,9 +61,6 @@
 	g++ -c $(CFLAGS) $< -o$@
 
 .d.o:
-	$(DC) -c $(DFLAGS) -Hf$*.di $< -of$@
-
-.d.bc:
 	$(DC) -c $(DFLAGS) -Hf$*.di $< -of$@ -output-bc
 
 .ll.bc:
@@ -133,7 +130,7 @@
 tango.clib : $(LIB_TARGET_C_ONLY)
 tango.sharedlib : $(LIB_TARGET_SHARED)
 
-$(LIB_TARGET_BC_ONLY) : $(ALL_OBJS_BC)
+$(LIB_TARGET_BC_ONLY) : $(ALL_OBJS_O)
 	$(RM) $@
 	$(LC) $@ $(ALL_OBJS_BC)
 
@@ -167,8 +164,8 @@
 
 clean :
 	find . -name "*.di" | xargs $(RM)
-	$(RM) $(ALL_OBJS)
-	$(RM) $(OBJ_STDC)
+	$(RM) $(ALL_OBJS_BC)
+	$(RM) $(ALL_OBJS_O)
 	$(RM) $(ALL_DOCS)
 	find . -name "$(LIB_MASK)" | xargs $(RM)
 
diff -r b411c41a9716 -r f1560a529987 runtime/lib/gc/basic/ldc.mak
--- a/runtime/lib/gc/basic/ldc.mak	Sun Oct 12 10:35:16 2008 +0200
+++ b/runtime/lib/gc/basic/ldc.mak	Sun Oct 12 10:42:54 2008 +0200
@@ -57,12 +57,9 @@
 .cpp.o:
 	g++ -c $(CFLAGS) $< -o$@
 
-.d.bc:
+.d.o:
 	$(DC) -c $(DFLAGS) $< -of$@ -output-bc
 
-.d.o:
-	$(DC) -c $(DFLAGS) $< -of$@
-
 .d.html:
 	$(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
 #	$(DC) -c -o- $(DOCFLAGS) -Df$*.html dmd.ddoc $<
@@ -99,7 +96,7 @@
 basic.nlib : $(LIB_TARGET_NATIVE)
 basic.sharedlib : $(LIB_TARGET_SHARED)
 
-$(LIB_TARGET_BC) : $(ALL_OBJS_BC)
+$(LIB_TARGET_BC) : $(ALL_OBJS_O)
 	$(RM) $@
 	$(LC) $@ $(ALL_OBJS_BC)
 
@@ -120,7 +117,8 @@
 
 clean :
 	find . -name "*.di" | xargs $(RM)
-	$(RM) $(ALL_OBJS)
+	$(RM) $(ALL_OBJS_BC)
+	$(RM) $(ALL_OBJS_O)
 	$(RM) $(ALL_DOCS)
 	$(RM) $(LIB_MASK)