small makefile cleanup

2 files changed, 46 insertions, 16 deletions

diff --git a/src/Makefile b/src/Makefile
index 87da130..478d4d2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,7 +31,7 @@
 
 include include.mk
 
-OBJS = tunDevice.o \
+OBJS := tunDevice.o \
        packetSource.o \
        buffer.o \
        syncBuffer.o \
@@ -54,7 +54,7 @@ OBJS = tunDevice.o \
        seqWindow.o \
 			 routingTreeNode.o \
 
-SYNCOBJS= syncServer.o \
+SYNCOBJS := syncServer.o \
        syncClient.o \
        syncQueue.o \
 			 syncCommand.o \
@@ -62,14 +62,14 @@ SYNCOBJS= syncServer.o \
        syncConnectionCommand.o \
        syncTcpConnection.o
 
-ANYCTROBJS = signalController.o \
+ANYCTROBJS := signalController.o \
 							anyCtrOptions.o \
 						 buffer.o \
 						 log.o \
 						 syncTcpConnection.o \
 						 syncServer.o
 
-ANYCONFOBJS = log.o \
+ANYCONFOBJS := log.o \
 						 buffer.o \
 						 keyDerivation.o \
 						 keyDerivationFactory.o \
@@ -89,14 +89,14 @@ 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
+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)
+SRCS := $(OBJS:%.o=%.cpp)
+SYNCSRCS := $(SYNCOBJS:%.o=%.cpp)
+ANYCTRSRCS := $(ANYCTROBJS:%.o=%.cpp)
+ANYCONFSRCS := $(ANYCONFOBJS:%.o=%.cpp)
+EXESRCS := $(EXEOBJS:%.o=%.cpp)
 
 .PHONY: distclean cleanall clean ctags
 
@@ -110,6 +110,7 @@ all: $(EXECUTABLE) #libAnysync.a
 
 -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)
 
@@ -132,6 +133,7 @@ anytun-config: $(ANYCONFOBJS) anytun-config.o
 anytun-controld: $(ANYCTROBJS) anytun-controld.o
 	$(LD) $(ANYCTROBJS) anytun-controld.o -o $@ $(LDFLAGS)
 
+
 options.o: options.cpp 
 	$(CXX) -DANYTUN_OPTIONS $(CXXFLAGS) $< -c -o $@
 
@@ -144,6 +146,7 @@ anyConfOptions.o: options.cpp
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) $< -c
 
+
 libAnysync.a: $(OBJS)
 	ar cru $@ $(OBJS)
 	ranlib $@
@@ -151,6 +154,7 @@ libAnysync.a: $(OBJS)
 anyrtpproxy: anytun
 	$(MAKE) --directory=$(CURDIR)/anyrtpproxy
 
+
 distclean: cleanall
 	find . -name *.o -exec rm -f {} \;
 	rm -f config.sub config.guess
@@ -173,8 +177,3 @@ clean:
 manpage:
 	@cd man ; $(MAKE)
 
-doxygen:
-	doxygen Doxyfile
-
-ctags:
-	ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .
diff --git a/src/man/Makefile b/src/man/Makefile
index a015ace..cdd45a6 100644
--- a/src/man/Makefile
+++ b/src/man/Makefile
@@ -1,3 +1,34 @@
+##
+##  anytun
+##
+##  The secure anycast tunneling protocol (satp) defines a protocol used
+##  for communication between any combination of unicast and anycast
+##  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
+##  mode and allows tunneling of every ETHER TYPE protocol (e.g.
+##  ethernet, ip, arp ...). satp directly includes cryptography and
+##  message authentication based on the methodes used by SRTP.  It is
+##  intended to deliver a generic, scaleable and secure solution for
+##  tunneling and relaying of packets of any protocol.
+##
+##
+##  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+##                          Christian Pointner <satp@wirdorange.org>
+##
+##  This file is part of Anytun.
+##
+##  Anytun is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License version 3 as
+##  published by the Free Software Foundation.
+##
+##  Anytun is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
+##
+
 all: manpage
 
 anytun.8: anytun.8.txt