From 02296ef775fa4afe5d4049906fac0b99bae14b8d Mon Sep 17 00:00:00 2001 From: Mikal Villa Date: Thu, 17 Jul 2014 19:12:52 +0200 Subject: [PATCH] Moving file list to a common one. Still in makefile format, but now with CPP/H as input instead of OBJECTS. Issue #82 --- Makefile.linux | 7 +------ Makefile.osx | 7 +------ filelist.mk | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 filelist.mk diff --git a/Makefile.linux b/Makefile.linux index 5c04f3fd..2ebc1889 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -1,12 +1,7 @@ CC = g++ CFLAGS = -g -Wall -std=c++0x -OBJECTS = obj/CryptoConst.o obj/base64.o obj/NTCPSession.o obj/RouterInfo.o obj/Transports.o \ - obj/RouterContext.o obj/NetDb.o obj/LeaseSet.o obj/Tunnel.o obj/TunnelEndpoint.o \ - obj/TunnelGateway.o obj/TransitTunnel.o obj/I2NPProtocol.o obj/Log.o obj/Garlic.o \ - obj/HTTPServer.o obj/Streaming.o obj/Identity.o obj/SSU.o obj/util.o obj/Reseed.o \ - obj/UPnP.o obj/TunnelPool.o obj/HTTPProxy.o obj/AddressBook.o obj/Daemon.o \ - obj/DaemonLinux.o obj/SSUData.o obj/i2p.o obj/aes.o obj/SOCKS.o +include filelist.mk INCFLAGS = LDFLAGS = -Wl,-rpath,/usr/local/lib -lcryptopp -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options -lpthread LIBS = diff --git a/Makefile.osx b/Makefile.osx index 494898fd..1c48d2a6 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -1,11 +1,6 @@ CC = clang++ CFLAGS = -g -Wall -std=c++11 -lstdc++ -I/usr/local/include -OBJECTS = obj/CryptoConst.o obj/base64.o obj/NTCPSession.o obj/RouterInfo.o obj/Transports.o \ - obj/RouterContext.o obj/NetDb.o obj/LeaseSet.o obj/Tunnel.o obj/TunnelEndpoint.o \ - obj/TunnelGateway.o obj/TransitTunnel.o obj/I2NPProtocol.o obj/Log.o obj/Garlic.o \ - obj/HTTPServer.o obj/Streaming.o obj/Identity.o obj/SSU.o obj/util.o obj/Reseed.o \ - obj/UPnP.o obj/TunnelPool.o obj/HTTPProxy.o obj/AddressBook.o obj/Daemon.o \ - obj/DaemonLinux.o obj/SSUData.o obj/i2p.o obj/aes.o obj/SOCKS.o +include filelist.mk INCFLAGS = -DCRYPTOPP_DISABLE_ASM LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -lcryptopp -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options -lpthread LIBS = diff --git a/filelist.mk b/filelist.mk new file mode 100644 index 00000000..4ebf7c09 --- /dev/null +++ b/filelist.mk @@ -0,0 +1,18 @@ + + +CPP_FILES := CryptoConst.cpp base64.cpp NTCPSession.cpp RouterInfo.cpp Transports.cpp \ + RouterContext.cpp NetDb.cpp LeaseSet.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelGateway.cpp \ + TransitTunnel.cpp I2NPProtocol.cpp Log.cpp Garlic.cpp HTTPServer.cpp Streaming.cpp Identity.cpp \ + SSU.cpp util.cpp Reseed.cpp DaemonLinux.cpp SSUData.cpp i2p.cpp aes.cpp SOCKS.cpp UPnP.cpp \ + TunnelPool.cpp HTTPProxy.cpp AddressBook.cpp Daemon.cpp + + +H_FILES := CryptoConst.h base64.h NTCPSession.h RouterInfo.h Transports.h \ + RouterContext.h NetDb.h LeaseSet.h Tunnel.h TunnelEndpoint.h TunnelGateway.h \ + TransitTunnel.h I2NPProtocol.h Log.h Garlic.h HTTPServer.h Streaming.h Identity.h \ + SSU.h util.h Reseed.h DaemonLinux.h SSUData.h i2p.h aes.h SOCKS.h UPnP.h TunnelPool.h \ + HTTPProxy.h AddressBook.h Daemon.h + + +OBJECTS = $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o))) +