webserver 1.5: Fixed Makefiles

8 files changed, 17 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index edadb60..45beff4 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ endif
 CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
 
 LIBS=\
+-lcommon \
 -lboost_context \
 -lboost_filesystem \
 -lboost_timer \
@@ -50,8 +51,7 @@ LIBS=\
 -lcrypt \
 -lpthread \
 -lssl -lcrypto \
--ldl \
--lcommon
+-ldl
 
 #-lboost_coroutine \
 #-lboost_program_options \
diff --git a/plugins/cgi/Makefile b/plugins/cgi/Makefile
index 8faebdc..a4fdb15 100644
--- a/plugins/cgi/Makefile
+++ b/plugins/cgi/Makefile
@@ -31,6 +31,7 @@ endif
 CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
 
 LIBS=\
+-lcommon \
 -lboost_context \
 -lboost_coroutine \
 -lboost_program_options \
@@ -40,8 +41,7 @@ LIBS=\
 -lboost_regex \
 -lpthread \
 -lssl -lcrypto \
--ldl \
--lcommon
+-ldl
 
 ifeq ($(CXX),clang++-10)
 LIBS+= \
@@ -77,7 +77,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o)
-	$(CXX) -shared $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)
 
diff --git a/plugins/fcgi/Makefile b/plugins/fcgi/Makefile
index c2789d8..0cafe54 100644
--- a/plugins/fcgi/Makefile
+++ b/plugins/fcgi/Makefile
@@ -76,7 +76,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: $(SRC:.cpp=.o)
-	$(CXX) -shared $(CXXFLAGS) $^ $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)
 
diff --git a/plugins/redirect/Makefile b/plugins/redirect/Makefile
index aea8106..99aedb1 100644
--- a/plugins/redirect/Makefile
+++ b/plugins/redirect/Makefile
@@ -74,7 +74,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: $(SRC:.cpp=.o)
-	$(CXX) -shared $(CXXFLAGS) $^ $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)
 
diff --git a/plugins/static-files/Makefile b/plugins/static-files/Makefile
index e96257d..14c6c17 100644
--- a/plugins/static-files/Makefile
+++ b/plugins/static-files/Makefile
@@ -31,6 +31,7 @@ endif
 CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
 
 LIBS=\
+-lcommon \
 -lboost_context \
 -lboost_coroutine \
 -lboost_program_options \
@@ -40,8 +41,7 @@ LIBS=\
 -lboost_regex \
 -lpthread \
 -lssl -lcrypto \
--ldl \
--lcommon
+-ldl
 
 ifeq ($(CXX),clang++-10)
 LIBS+= \
@@ -77,7 +77,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o)
-	$(CXX) -shared $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)
 
diff --git a/plugins/statistics/Makefile b/plugins/statistics/Makefile
index 48c2e8c..3dee26e 100644
--- a/plugins/statistics/Makefile
+++ b/plugins/statistics/Makefile
@@ -74,7 +74,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: $(SRC:.cpp=.o)
-	$(CXX) -shared $(CXXFLAGS) $^ $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)
 
diff --git a/plugins/webbox/Makefile b/plugins/webbox/Makefile
index 4794e72..34f253b 100644
--- a/plugins/webbox/Makefile
+++ b/plugins/webbox/Makefile
@@ -31,6 +31,7 @@ endif
 CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
 
 LIBS=\
+-lcommon \
 -lboost_context \
 -lboost_coroutine \
 -lboost_program_options \
@@ -40,8 +41,7 @@ LIBS=\
 -lboost_regex \
 -lpthread \
 -lssl -lcrypto \
--ldl \
--lcommon
+-ldl
 
 ifeq ($(CXX),clang++-10)
 LIBS+= \
@@ -77,7 +77,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o)
-	$(CXX) -shared $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)
 
diff --git a/plugins/weblog/Makefile b/plugins/weblog/Makefile
index b660995..466ddbd 100644
--- a/plugins/weblog/Makefile
+++ b/plugins/weblog/Makefile
@@ -31,6 +31,7 @@ endif
 CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
 
 LIBS=\
+-lcommon \
 -lboost_context \
 -lboost_coroutine \
 -lboost_program_options \
@@ -40,8 +41,7 @@ LIBS=\
 -lboost_regex \
 -lpthread \
 -lssl -lcrypto \
--ldl \
--lcommon
+-ldl
 
 ifeq ($(CXX),clang++-10)
 LIBS+= \
@@ -77,7 +77,7 @@ test-$(PROJECTNAME): $(TESTSRC:.cpp=.o)
 	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
 
 $(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o)
-	$(CXX) -shared $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@
 
 dep: $(TESTSRC:.cpp=.d)