--- Makefile	2006-02-27 07:49:57.000000000 +0100
+++ Makefile_new	2006-03-08 10:05:39.000000000 +0100
@@ -36,35 +36,38 @@
 	@echo ""
 	@exit
 
-build: policyd cleanup stats
+build: policyd_start policyd cleanup stats
 
 linux: all
 solaris: all
 freebsd: all
 
-policyd: policyd_start syslog.o generic.o policyd.o sockets.o cidr.o \
-	greylist.o throttle.o spamtrap.o blacklist.o whitelist.o \
-	blacklist_helo.o throttle_host.o throttle_sasl.o throttle_from.o \
-	throttle_rcpt.o cleanup.o mysql.o helo.o stats.o
+policyd: syslog.o policyd.o generic.o mysql.o greylist.o throttle.o sockets.o cidr.o spamtrap.o blacklist.o blacklist_helo.o \
+	whitelist.o throttle_host.o throttle_sasl.o throttle_from.o throttle_rcpt.o helo.o
 	@echo ""
 	@echo "[*] Linking policyd*"
-	@$(CC) $(CFLAGS) $(CPPFLAGS) syslog.o policyd.o generic.o mysql.o \
-	greylist.o throttle.o sockets.o cidr.o spamtrap.o blacklist.o \
-	blacklist_helo.o whitelist.o throttle_host.o throttle_sasl.o \
-	throttle_from.o throttle_rcpt.o helo.o $(LDLIBS) -o policyd
+	@$(CC) $(CFLAGS) $(CPPFLAGS) \
+	syslog.o policyd.o generic.o mysql.o greylist.o throttle.o sockets.o cidr.o spamtrap.o blacklist.o blacklist_helo.o \
+	whitelist.o throttle_host.o throttle_sasl.o throttle_from.o throttle_rcpt.o helo.o \
+	$(LDLIBS) -o policyd
 
 cleanup: syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o
 	@echo "[*] Linking cleanup*"
-	@$(CC) $(CFLAGS) $(CPPFLAGS) syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o \
+	@$(CC) $(CFLAGS) $(CPPFLAGS) \
+	syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o \
 	$(LDLIBS) -o cleanup
 
 stats: cidr.o syslog.o stats.o generic.o sockets.o mysql.o
 	@echo "[*] Linking stats*"
-	@$(CC) $(CFLAGS) $(CPPFLAGS) cidr.o syslog.o stats.o generic.o sockets.o mysql.o \
+	@$(CC) $(CFLAGS) $(CPPFLAGS) \
+	cidr.o syslog.o stats.o generic.o sockets.o mysql.o \
 	$(LDLIBS) -o stats
 	@echo ""
 
-policyd_start:
+policyd_start: blacklist.o blacklist_helo.o cidr.o cleanup.o \
+	generic.o greylist.o helo.o mysql.o policyd.o sockets.o \
+	spamtrap.o stats.o syslog.o throttle.o throttle_from.o \
+	throttle_host.o throttle_rcpt.o throttle_sasl.o whitelist.o
 	@echo ""
 	@echo "[-] Building Policy Daemon:"
 	@echo ""