From 9f7a2ab6cb93a2239ba790b51937b121d1c9c7a6 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Thu, 15 Jan 2009 14:14:46 +0000
Subject: improved Makefile (clean now for -j *)

---
 src/Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index e4bb487..52956e6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -104,22 +104,26 @@ ANYCONFOBJS = log.o \
 						 syncRouteCommand.o \
 						 syncConnectionCommand.o
 
+EXECUTABLE = anytun anytun-config anytun-controld anytun-showtables
+EXEOBJS = anytun.o anytun-config.o anytun-controld.o anytun-showtables.o
+
 SRCS = $(OBJS:%.o=%.cpp)
 SYNCSRCS = $(SYNCOBJS:%.o=%.cpp)
 ANYCTRSRCS = $(ANYCTROBJS:%.o=%.cpp)
 ANYCONFSRCS = $(ANYCONFOBJS:%.o=%.cpp)
+EXESRCS = $(EXEOBJS:%.o=%.cpp)
 
-EXECUTABLE = anytun anytun-config anytun-controld anytun-showtables
-DEPENDFILE = .depend
-
-.PHONY: dep distclean cleanall clean ctags
+.PHONY: distclean cleanall clean ctags
 
-all: dep $(EXECUTABLE) #libAnysync.a 
+all: $(EXECUTABLE) #libAnysync.a 
 
-dep: $(SRCS) $(SYNCSRCS) $(ANYCTRSRCS) $(ANYCONFSRCS)
-	$(CC) -MM $(SRCS) $(SYNCSRCS) $(ANYCTRSRCS) $(ANYCONFSRCS) > $(DEPENDFILE)
+%.d: %.cpp
+	@set -e; rm -f $@; \
+	 $(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \
+   sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+   rm -f $@.$$$$; echo '(re)building $@'
 
--include $(DEPENDFILE)
+-include $(SRCS:%.cpp=%.d) $(SYNCSRCS:%.cpp=%.d) $(ANYCTRSRCS:%.cpp=%.d) $(ANYCONFSRCS:%.cpp=%.d) $(EXESRCS:%.cpp=%.d)
 
 anytun: $(OBJS) $(SYNCOBJS) anytun.o
 	$(LD) $(OBJS) $(SYNCOBJS) anytun.o -o $@ $(LDFLAGS)
@@ -163,7 +167,7 @@ cleanall: clean
 
 clean:
 	rm -f *.o
-	rm -f $(DEPENDFILE)
+	rm -f *.d
 	rm -f $(EXECUTABLE)
 	rm -f anytun-nosync
 	rm -f -r doc/html/*
-- 
cgit v1.2.3