X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=Makefile;h=40894b5ae3fdaaff7b2eac0293aeb08d899bcffc;hb=52534a99b8e1644411383e8406519add7984cee9;hp=0e9e02cfec7d6bfd3945b0dc12dd7601731bf3d0;hpb=1c42f5f8ed1972f13424197e9493bbed8e401576;p=apps%2Fpfixtools.git

diff --git a/Makefile b/Makefile
index 0e9e02c..40894b5 100644
--- a/Makefile
+++ b/Makefile
@@ -34,21 +34,24 @@ all:
 LDFLAGS += -Wl,--warn-common
 
 include mk/cflags.mk
+include mk/tc.mk
 
 CFLAGS += --std=gnu99 -D_GNU_SOURCE
 prefix ?= /usr/local
 
 PROGRAMS = postlicyd pfix-srsd
+LIBS     = lib
 TESTS    = tst-rbl
 
 GENERATED = tokens.h tokens.c
 
-postlicyd_SOURCES = common.c threads.c str.c buffer.c rbl.c \
-		    $(GENERATED) postfix.c main-postlicyd.c
-postlicyd_LIBADD = -lpthread
+lib_SOURCES = str.c buffer.c common.c epoll.c $(GENERATED)
 
-pfix-srsd_SOURCES = common.c epoll.c buffer.c str.c main-srsd.c
-pfix-srsd_LIBADD = -lsrs2
+postlicyd_SOURCES = greylist.c rbl.c main-postlicyd.c lib.a
+postlicyd_LIBADD  = $(TC_LIBS)
+
+pfix-srsd_SOURCES = main-srsd.c lib.a
+pfix-srsd_LIBADD  = -lsrs2
 
 tst-rbl_SOURCES = tst-rbl.c
 
@@ -62,7 +65,7 @@ install: all
 all: $(GENERATED) $(PROGRAMS) | $(GENERATED)
 
 clean:
-	$(RM) $(PROGRAMS) $(TESTS) .*.o .*.dep
+	$(RM) $(LIBS:=.a) $(PROGRAMS) $(TESTS) .*.o .*.dep
 
 distclean: clean
 	$(RM) $(GENERATED)
@@ -71,7 +74,7 @@ tags: .tags
 .tags: $(shell git ls-files | egrep '\.[hc]$$')
 	ctags -o $@ $^
 
-headers: HEADACHEOPTS=-c mk/headache.cfg -h COPYING
+headers: HEADACHEOPTS=-c mk/headache.cfg -h mk/COPYING
 headers:
 	@which headache > /dev/null || \
 		( echo "package headache not installed" ; exit 1 )
@@ -84,14 +87,19 @@ headers:
 	./$< $@ || ($(RM) $@; exit 1)
 
 .%.o: %.c Makefile
+	$(shell test -d $(@D) || mkdir -p $(@D))
 	$(CC) $(CFLAGS) -MMD -MT ".$*.dep $@" -MF .$*.dep -g -c -o $@ $<
 
 .%.dep: .%.o
 
 .SECONDEXPANSION:
 
+$(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 $@ $(CFLAGS) $($@_CFLAGS) $(filter %.ld,$^) $(filter %.o,$^) $(LDFLAGS) $($@_LIBADD) $(filter %.a,$^)
+	$(CC) -o $@ $(filter %.ld,$^) $(filter %.o,$^) $(LDFLAGS) $($@_LIBADD) $(filter %.a,$^)
 
 -include $(foreach p,$(PROGRAMS) $(TESTS),$(patsubst %.c,.%.dep,$(filter %.c,$($p_SOURCES))))