Updates to makefiles. It's not robust with regard to the .bc files, but it works.

This commit is contained in:
Christian Kamm
2008-10-12 10:42:54 +02:00
parent 6cb213badf
commit e1283d80d2
3 changed files with 11 additions and 19 deletions

View File

@@ -57,9 +57,6 @@ LIB_DEST=..
g++ -c $(CFLAGS) $< -o$@
.d.o:
$(DC) -c $(DFLAGS) $< -of$@
.d.bc:
$(DC) -c $(DFLAGS) $< -of$@ -output-bc
.d.html:
@@ -67,7 +64,7 @@ LIB_DEST=..
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.clib : $(LIB_TARGET_C_ONLY)
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 @@ ldc.doc : $(ALL_DOCS)
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)

View File

@@ -61,9 +61,6 @@ DOC_DEST=../../../doc/tango
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.lib : $(LIB_TARGET_FULL)
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 @@ tango.doc : $(ALL_DOCS)
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)

View File

@@ -57,11 +57,8 @@ LIB_DEST=..
.cpp.o:
g++ -c $(CFLAGS) $< -o$@
.d.bc:
$(DC) -c $(DFLAGS) $< -of$@ -output-bc
.d.o:
$(DC) -c $(DFLAGS) $< -of$@
$(DC) -c $(DFLAGS) $< -of$@ -output-bc
.d.html:
$(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
@@ -99,7 +96,7 @@ basic.lib : $(LIB_TARGET_BC)
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 @@ basic.doc : $(ALL_DOCS)
clean :
find . -name "*.di" | xargs $(RM)
$(RM) $(ALL_OBJS)
$(RM) $(ALL_OBJS_BC)
$(RM) $(ALL_OBJS_O)
$(RM) $(ALL_DOCS)
$(RM) $(LIB_MASK)