diff options
| author | John Denker <jsd@av8n.com> | 2012-07-30 14:34:05 -0700 |
|---|---|---|
| committer | John Denker <jsd@av8n.com> | 2012-07-30 14:34:05 -0700 |
| commit | 7024dc330299921af649330c45b99c21c3d7f022 (patch) | |
| tree | 9f747a0423647b016376fe353ceea197a5848cbf /tools/makefile | |
| parent | ce0dbe5332d4eb921c09cc48cc52634211d7089a (diff) | |
| parent | f8be4baf5a2318363b42f8883f66ed8a976dfc79 (diff) | |
Merge branch 'master' of ephedra:usr/src/qmail into e_master
Conflicts:
tools/makefile
Diffstat (limited to 'tools/makefile')
| -rw-r--r-- | tools/makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/tools/makefile b/tools/makefile index 76df23b..6594ca8 100644 --- a/tools/makefile +++ b/tools/makefile @@ -15,10 +15,10 @@ qmain = pido.c hi-q.c skrewt.c hi-test.c mail-scan.c greylist.c wripper.c qprogs = $(qmain:%.c=%) # sources for other main programs: -moremain = wripper.c bash-c.c +moremain = wripper.c bash-c.c ltgrey.c moreprogs = $(moremain:%.c=%) -nonmain = +nonmain = libltgrey.c sources = $(qmain) $(moremain) $(nonmain) @@ -37,17 +37,24 @@ all: $(qprogs) $(moreprogs) show: : --- $(qprogs) +++ $(moreprogs) -greylist: greylist.o - $(CC) $< -lboost_filesystem-mt -lboost_system -o $@ +skrewt: skrewt.o utils.o + $(CC) $^ -lboost_filesystem-mt -lboost_system -o $@ -# $(CC) $< -lboost_filesystem -o $@ +greylist: greylist.o utils.o + $(CC) $^ -lboost_filesystem-mt -lboost_system -o $@ + +ltgrey: ltgrey.o utils.o libltgrey.o + $(CC) $^ -lboost_filesystem-mt -lboost_system -o $@ wripper: wripper.o - $(CC) $< -o $@ + $(CC) $^ -o $@ chgrp daemon $@ && chmod g+s $@ || true -mail-scan: mail-scan.o - $(CC) $< -lboost_regex -o $@ +mail-scan: mail-scan.o utils.o + $(CC) $^ -lboost_regex -o $@ + +hi-test: hi-test.o utils.o + $(CC) $^ -lboost_regex -o $@ install: install $(qprogs) /var/qmail/bin/ |