update makefile-s

Makefile

@@ -78,7 +78,7 @@ obj/%.o: %.cpp
 
 DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
 $(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT)
-	$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+	$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
 $(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
 ifneq ($(USE_STATIC),yes)

Makefile.homebrew

@@ -9,9 +9,9 @@ LDFLAGS = -L${SSLROOT}/lib -L${BOOSTROOT}/lib
 LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 
 ifeq ($(USE_UPNP),yes)
-  LDFLAGS += -ldl
+	LDFLAGS += -ldl
-  CXXFLAGS += -DUSE_UPNP
+	CXXFLAGS += -DUSE_UPNP
-  LDLIBS += -lminiupnpc
+	LDLIBS += -lminiupnpc
 endif
 
 # OSX Notes
@@ -20,7 +20,7 @@ endif
 # Found no good way to detect it from command line. TODO: Might be some osx sysinfo magic
 # note from psi: 2009 macbook does not have aesni
 #ifeq ($(USE_AESNI),yes)
-#  CXXFLAGS += -maes -DAESNI
+#	CXXFLAGS += -maes -DAESNI
 #endif
 
 # Disabled, since it will be the default make rule. I think its better

Makefile.linux

@@ -31,27 +31,27 @@ ifeq ($(USE_STATIC),yes)
 # NOTE: on glibc you will get this warning:
 #   Using 'getaddrinfo' in statically linked applications requires at runtime
 #   the shared libraries from the glibc version used for linking
-  LIBDIR := /usr/lib
+	LIBDIR := /usr/lib
-  LDLIBS  = $(LIBDIR)/libboost_system.a
+	LDLIBS  = $(LIBDIR)/libboost_system.a
-  LDLIBS += $(LIBDIR)/libboost_date_time.a
+	LDLIBS += $(LIBDIR)/libboost_date_time.a
-  LDLIBS += $(LIBDIR)/libboost_filesystem.a
+	LDLIBS += $(LIBDIR)/libboost_filesystem.a
-  LDLIBS += $(LIBDIR)/libboost_program_options.a
+	LDLIBS += $(LIBDIR)/libboost_program_options.a
-  LDLIBS += $(LIBDIR)/libssl.a
+	LDLIBS += $(LIBDIR)/libssl.a
-  LDLIBS += $(LIBDIR)/libcrypto.a
+	LDLIBS += $(LIBDIR)/libcrypto.a
-  LDLIBS += $(LIBDIR)/libz.a
+	LDLIBS += $(LIBDIR)/libz.a
-  LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
+	LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
-  USE_AESNI := no
+	USE_AESNI := no
 else
-  LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
+	LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 endif
 
 # UPNP Support (miniupnpc 1.5 and higher)
 ifeq ($(USE_UPNP),yes)
-  CXXFLAGS += -DUSE_UPNP
+	CXXFLAGS += -DUSE_UPNP
 ifeq ($(USE_STATIC),yes)
-  LDLIBS += $(LIBDIR)/libminiupnpc.a
+	LDLIBS += $(LIBDIR)/libminiupnpc.a
 else
-  LDLIBS += -lminiupnpc
+	LDLIBS += -lminiupnpc
 endif
 endif
 

Makefile.mingw

@@ -5,29 +5,28 @@ CXXFLAGS = -Os -D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN
 NEEDED_CXXFLAGS = -std=c++11
 BOOST_SUFFIX = -mt
 INCFLAGS = -I/usr/include/ -I/usr/local/include/ -I. -Idaemon
-LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
+LDFLAGS = -Wl,-rpath,/usr/local/lib -Wl,-Bstatic -static-libgcc -static-libstdc++ -L/usr/local/lib
 
 # UPNP Support
 ifeq ($(USE_UPNP),yes)
-  CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
+	CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
-  LDLIBS = -Wl,-Bstatic -lminiupnpc
+	LDLIBS = -lminiupnpc
 endif
 
 LDLIBS += \
-  -Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
+	-lboost_system$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
+	-lboost_date_time$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
+	-lboost_filesystem$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
+	-lboost_program_options$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lssl \
+	-lssl \
-  -Wl,-Bstatic -lcrypto \
+	-lcrypto \
-  -Wl,-Bstatic -lz \
+	-lz \
-  -Wl,-Bstatic -lwsock32 \
+	-lwsock32 \
-  -Wl,-Bstatic -lws2_32 \
+	-lws2_32 \
-  -Wl,-Bstatic -lgdi32 \
+	-lgdi32 \
-  -Wl,-Bstatic -liphlpapi \
+	-liphlpapi \
-  -static-libgcc -static-libstdc++ \
+	-lstdc++ \
-  -Wl,-Bstatic -lstdc++ \
+	-lpthread
-  -Wl,-Bstatic -lpthread
 
 ifeq ($(USE_WIN32_APP), yes)
 	CXXFLAGS += -DWIN32_APP
@@ -49,7 +48,7 @@ endif
 
 ifeq ($(USE_ASLR),yes)
 	LDFLAGS += -Wl,--nxcompat -Wl,--high-entropy-va \
-      -Wl,--dynamicbase,--export-all-symbols
+	-Wl,--dynamicbase,--export-all-symbols
 endif
 
 obj/%.o : %.rc