From 7a13a04dc0ef562e53097f614e887285965d4659 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 27 Feb 2011 15:40:03 +0100
Subject: build in all backend plugins

---
 Makefile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0516a6f..b7a5653 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,6 @@ INSTALLDIR ?= $(moduledir)/imap
 # Kill CFLAGS from dovecot-config
 CFLAGS := $(CFLAGSORIG)
 
-backenddir := /usr/lib/dovecot-antispam
-LOCALCFLAGS += '-DBACKENDDIR="$(backenddir)"'
-
 # includes/flags we need for building a dovecot plugin
 INCS += -DHAVE_CONFIG_H
 INCS += -I$(DOVECOT)/
@@ -41,14 +38,14 @@ ifeq ("$(DEBUG_VERBOSE)", "1")
 LOCALCFLAGS += -DCONFIG_DEBUG_VERBOSE
 endif
 
-BACKENDS = dspam-exec.so signature-log.so crm114-exec.so pipe.so spool2dir.so
+objs += dspam-exec.o signature-log.o crm114-exec.o pipe.o spool2dir.o
 
 # main make rules
 LOCALCFLAGS += -fPIC -shared -Wall -Wextra -DPLUGINNAME=$(PLUGINNAME)
 CC ?= cc
 HOSTCC ?= cc
 
-all: verify_config $(LIBRARY_NAME) $(BACKENDS)
+all: verify_config $(LIBRARY_NAME)
 
 antispam-storage.o: antispam-storage.c antispam-storage-*.c $(CONFIG) antispam-plugin.h dovecot-version.h
 	$(CC) -c $(CFLAGS) $(LOCALCFLAGS) $(INCS) -o $@ $<
@@ -68,23 +65,12 @@ dovecot-version.h: dovecot-version
 antispam-version.h: version.sh
 	./version.sh > antispam-version.h
 
-dspam-exec.so: dspam-exec.o signature.o
-signature-log.so: signature-log.o signature.o
-crm114-exec.so: crm114-exec.o signature.o
-pipe.so: pipe.o
-spool2dir.so: spool2dir.o
-
-$(BACKENDS):
-	$(CC) $(CFLAGS) $(INCS) $(LOCALCFLAGS) $(LDFLAGS) -o $@ $^
-
 
 clean:
 	rm -f *.so *.o *~ dovecot-version dovecot-version.h antispam-version.h
 
 install: all
 	install -p -m 0755 $(LIBRARY_NAME) $(DESTDIR)$(INSTALLDIR)/
-	mkdir -p $(DESTDIR)$(backenddir)
-	install -p -m 0755 $(BACKENDS) $(DESTDIR)$(backenddir)/
 
 verify_config:
 	@if [ ! -r $(CONFIG) ]; then \
-- 
cgit v1.2.3