From b3face5de91cf303bf1106a7e668ae5801f00c22 Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@csclub.uwaterloo.ca>
Date: Fri, 31 Jul 2009 01:25:28 -0400
Subject: [PATCH] Cleanup Makefile

---
 src/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 7d32aef4c..f6f9a29fc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ EXT_PROGS := config-test
 
 LDAP_OBJECTS   := ldap.o
 LDAP_LIBS      := -lldap
-LDAP_PROGS     := addmember addclub op-adduser
+LDAP_PROGS     := op-adduser
 KRB5_OBJECTS   := krb5.o kadm.o
 KRB5_LIBS      := $(shell krb5-config --libs krb5 kadm-client)
 KRB5_PROGS     := addmember addclub op-adduser
@@ -41,8 +41,11 @@ op-adduser.o addmember.o addclub.o: ceo.pb-c.h
 ceo.pb-c.c ceo.pb-c.h: ceo.proto
 	protoc-c --c_out=. ceo.proto
 
+%: %.o
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
 ceod: dmaster.o dslave.o
-	$(CC) $(LDFLAGS) $^ $(CFLAGS) $(LDLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 config-test: config-test.o parser.o
 
@@ -75,5 +78,4 @@ $(CONFIG_PROGS): $(CONFIG_OBJECTS)
 $(UTIL_PROGS):   LDLIBS += $(UTIL_LIBS)
 $(UTIL_PROGS):   $(UTIL_OBJECTS)
 
-.PHONY: clean all
-.SECONDARY: ceoc.o addmember.o addclub.o
+.PHONY: clean all install install_clients install_daemon