diff --git a/Makefile b/Makefile index db38b237..2296867a 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ obj/%.o : %.cpp %.h $(CXX) $(CXXFLAGS) $(INCFLAGS) -c -o $@ $< $(I2PD): $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC)) - $(CXX) -o $@ $(LDLIBS) $(LDFLAGS) $(LIBS) $^ + $(CXX) -o $@ $(LDLIBS) $(LDFLAGS) $^ $(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC)) $(CXX) -o $@ -shared $(CXXFLAGS) $(INCFLAGS) $^ diff --git a/Makefile.bsd b/Makefile.bsd index b160f0c8..12370c3b 100644 --- a/Makefile.bsd +++ b/Makefile.bsd @@ -3,4 +3,3 @@ CXXFLAGS = -g -Wall -O2 -std=c++11 INCFLAGS = -I/usr/include/ -I/usr/local/include/ LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread -LIBS = diff --git a/Makefile.linux b/Makefile.linux index 84d47e68..9f24f709 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -28,7 +28,6 @@ USE_AESNI := no else LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread endif -LIBS = ifeq ($(USE_AESNI),yes) ifeq ($(IS_64),1) diff --git a/Makefile.osx b/Makefile.osx index d690e09c..d7aa9362 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -3,7 +3,6 @@ CXXFLAGS = -g -Wall -std=c++11 -lstdc++ -I/usr/local/include INCFLAGS = -DCRYPTOPP_DISABLE_ASM LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread -LIBS = # OSX Notes # http://www.hutsby.net/2011/08/macs-with-aes-ni.html