X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mk%2Fcommon.mk;h=06454106fbc3bbde0ef51064e90b4a28e59aa7bf;hb=76226c6f7b43aaa6480f776f70fb62f4a3e937df;hp=3fcb4e4c8a52b8734384853ce270e8e034361007;hpb=8977d252fc44ae953df4bde4a2f1c5895beea4e0;p=apps%2Fpfixtools.git

diff --git a/mk/common.mk b/mk/common.mk
index 3fcb4e4..0645410 100644
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -1,18 +1,18 @@
 include ../mk/cflags.mk
 
 prefix ?= /usr/local
-LDFLAGS += -Wl,--warn-common
-CFLAGS  += --std=gnu99 -D_GNU_SOURCE -I../ -I../common
+LDFLAGSBASE += $(if $(DARWIN),-L/opt/local/lib,-Wl,-warn-common)
+CFLAGSBASE  += --std=gnu99 -I../ -I../common $(if $(DARWIN),-I/opt/local/include,)
 
 INSTALL_PROGS = $(addprefix install-,$(PROGRAMS))
 
+all: $(GENERATED) $(LIBS) $(PROGRAMS) | $(GENERATED)
+
 install: all $(INSTALL_PROGS)
 
 $(INSTALL_PROGS): install-%:
 	install $* $(DESTDIR)$(prefix)/sbin
 
-all: $(GENERATED) $(LIBS) $(PROGRAMS) | $(GENERATED)
-
 clean:
 	$(RM) $(LIBS:=.a) $(PROGRAMS) $(TESTS) .*.o .*.dep
 
@@ -49,8 +49,8 @@ $(LIBS:=.a): $$(patsubst %.c,.%.o,$$($$(patsubst %.a,%,$$@)_SOURCES)) Makefile
 	$(RM) $@
 	$(AR) rcs $@ $(filter %.o,$^)
 
-$(PROGRAMS) $(TESTS): $$(patsubst %.c,.%.o,$$($$@_SOURCES)) Makefile ../common.ld
-	$(CC) -o $@ $(filter %.ld,$^) $(filter %.o,$^) $(LDFLAGS) $($@_LIBADD) $(filter %.a,$^)
+$(PROGRAMS) $(TESTS): $$(patsubst %.c,.%.o,$$($$@_SOURCES)) Makefile
+	$(CC) -o $@ $(filter %.o,$^) $(LDFLAGS) $($@_LIBADD) $(filter %.a,$^)
 
 -include $(foreach p,$(PROGRAMS) $(TESTS),$(patsubst %.c,.%.dep,$(filter %.c,$($p_SOURCES))))