From 8b93572b386256c53c12012be87adabd73d80520 Mon Sep 17 00:00:00 2001
From: Roland Reichwein <mail@reichwein.it>
Date: Sun, 19 Apr 2020 19:46:14 +0200
Subject: Weblog (WIP)

---
 plugins/weblog/Makefile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'plugins/weblog/Makefile')

diff --git a/plugins/weblog/Makefile b/plugins/weblog/Makefile
index 27b68fc..ffd31e1 100644
--- a/plugins/weblog/Makefile
+++ b/plugins/weblog/Makefile
@@ -25,7 +25,7 @@ CXXFLAGS+= -pthread -fvisibility=hidden -fPIC
 ifeq ($(CXX),clang++-10)
 CXXFLAGS+=-std=c++20 #-stdlib=libc++
 else
-CXXFLAGS+=-std=c++2a
+CXXFLAGS+=-std=c++17
 endif
 
 CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
@@ -52,8 +52,8 @@ LIBS+= \
 #-lstdc++fs
 else
 LIBS+= \
--lstdc++
-#-lstdc++fs
+-lstdc++ \
+-lstdc++fs
 endif
 
 PROGSRC=\
@@ -92,14 +92,8 @@ googletest/src/%.o: googletest/src/%.cc
 ADD_DEP=Makefile
 
 install:
-	mkdir -p $(DESTDIR)/usr/bin
-	cp webserver $(DESTDIR)/usr/bin
-
 	mkdir -p $(DESTDIR)/usr/lib/webserver/plugins
-	mkdir -p $(DESTDIR)/usr/local/lib/webserver/plugins
-
-	mkdir -p $(DESTDIR)/etc
-	cp webserver.conf $(DESTDIR)/etc/webserver.conf
+	cp $(PROJECTNAME).so $(DESTDIR)/usr/lib/webserver/plugins
 
 # misc ---------------------------------------------------
 deb:
@@ -116,7 +110,7 @@ debs: $(DISTROS)
 
 clean:
 	-rm -f test-$(PROJECTNAME) $(PROJECTNAME)
-	-find . -name '*.o' -o -name '*.d' -o -name '*.gcno' -o -name '*.gcda' | xargs rm -f
+	-find . -name '*.o' -o -name '*.so' -o -name '*.d' -o -name '*.gcno' -o -name '*.gcda' | xargs rm -f
 
 zip: clean
 	-rm -f ../$(PROJECTNAME).zip
-- 
cgit v1.2.3