From cf8e229098e04c1f13dd5fd92846df4745976312 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Fri, 12 Dec 2014 08:53:17 +0000
Subject: [PATCH] * almost fixed static linking

---
 Makefile       | 4 ++--
 Makefile.linux | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7cfdd921..482ea81f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ obj/%.o : %.cpp %.h
 	$(CXX) $(CXXFLAGS) $(INCFLAGS) -c -o $@ $<
 
 $(I2PD):  $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
-	$(CXX) -o $@ $(LDLIBS) $(LDFLAGS) $^
+	$(CXX) -o $@ $^ $(LDFLAGS)  $(LDLIBS)
 
 $(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
-	$(CXX) -o $@ -shared $(CXXFLAGS) $(INCFLAGS) $^
+	$(CXX) -o $@ $^ $(LDFLAGS)  $(LDLIBS)
 
 clean:
 	rm -fr obj $(I2PD) $(SHLIB)
diff --git a/Makefile.linux b/Makefile.linux
index ffb89ee0..85a63ac0 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -17,16 +17,16 @@ endif
 
 ifeq ($(USE_STATIC),yes)
   LIBDIR := /usr/lib
-  LDLIBS  = $(LIBDIR)/libcryptopp.a
-  LDLIBS += $(LIBDIR)/libboost_system.a
+  LDLIBS  = $(LIBDIR)/libboost_system.a
   LDLIBS += $(LIBDIR)/libboost_date_time.a
   LDLIBS += $(LIBDIR)/libboost_filesystem.a
   LDLIBS += $(LIBDIR)/libboost_regex.a
   LDLIBS += $(LIBDIR)/libboost_program_options.a
+  LDLIBS += $(LIBDIR)/libcryptopp.a
   LDLIBS += -lpthread -static-libstdc++ -static-libgcc
   USE_AESNI := no
 else
-  LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
+  LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread -shared
 endif
 
 GREP = fgrep