* Add some compiler flexibility to two obscure SAM makefiles

This commit is contained in:
zzz
2008-06-01 20:50:29 +00:00
parent 6345e669bc
commit 3396a8813f
2 changed files with 10 additions and 10 deletions

View File

@@ -27,15 +27,15 @@ lib/libsam.so: obj/libsam.la
obj/libsam-static.la: $(OBJS) obj/libsam-static.la: $(OBJS)
$(STATUS) library '(static)' $(STATUS) library '(static)'
libtool --mode=link gcc -static $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG) libtool --mode=link $(CC) -static $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG)
obj/libsam.la: $(OBJS) obj/libsam.la: $(OBJS)
$(STATUS) library '(shared)' $(STATUS) library '(shared)'
libtool --mode=link gcc -rpath $(DESTDIR) $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG) libtool --mode=link $(CC) -rpath $(DESTDIR) $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG)
obj/%.lo: src/%.c obj/%.lo: src/%.c
$(STATUS) compile $* $(STATUS) compile $*
libtool --mode=compile gcc $(CFLAGS) -Iinc/ -c -o $@ $< >>$(LIBTOOL_LOG) libtool --mode=compile $(CC) $(CFLAGS) -Iinc/ -c -o $@ $< >>$(LIBTOOL_LOG)
$(OBJS):|obj $(OBJS):|obj
obj: obj:
@@ -44,7 +44,7 @@ obj:
.deps/%.d: src/%.c .deps/%.d: src/%.c
$(STATUS) deps $* $(STATUS) deps $*
gcc -Iinc/ -MM -MT obj/$*.o $< -o $@ $(CC) -Iinc/ -MM -MT obj/$*.o $< -o $@
-include $(DEPS) -include $(DEPS)
@@ -61,4 +61,4 @@ clean:
libtool --mode=clean rm -f obj/*.l* lib/*.l* lib/*.so* lib/*.a >>$(LIBTOOL_LOG) libtool --mode=clean rm -f obj/*.l* lib/*.l* lib/*.so* lib/*.a >>$(LIBTOOL_LOG)
rm -Rf .deps libtool.log rm -Rf .deps libtool.log
.PHONY: all cleanlog clean .PHONY: all cleanlog clean

View File

@@ -25,14 +25,14 @@ cleanlog:
i2p-ping: $(OBJS) i2p-ping: $(OBJS)
$(STATUS) link $(STATUS) link
libtool --mode=link gcc $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG) libtool --mode=link $(CC) $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG)
%.lo: %.c %.lo: %.c
$(STATUS) compile $* $(STATUS) compile $*
libtool --mode=compile gcc $(CFLAGS) -Iinc/ -c -o $@ $< >>$(LIBTOOL_LOG) libtool --mode=compile $(CC) $(CFLAGS) -Iinc/ -c -o $@ $< >>$(LIBTOOL_LOG)
.deps/%.d: src/%.c .deps/%.d: src/%.c
$(STATUS) deps $* $(STATUS) deps $*
gcc -Iinc/ -MM -MT obj/$*.o $^ -o $@ $(CC) -Iinc/ -MM -MT obj/$*.o $^ -o $@
clean: clean:
$(STATUS) clean $(STATUS) clean
@@ -44,11 +44,11 @@ obj:
$(STATUS) MKDIR $@ $(STATUS) MKDIR $@
mkdir -p $@ mkdir -p $@
-include $(DEPS) # -include $(DEPS)
$(DEPS):|.deps $(DEPS):|.deps
.deps: .deps:
$(STATUS) MKDIR $@ $(STATUS) MKDIR $@
mkdir -p $@ mkdir -p $@
.PHONY: all cleanlog clean .PHONY: all cleanlog clean