From d0db131a73933d0a6c65bab59d1e0e4f6a185338 Mon Sep 17 00:00:00 2001
From: Roland Reichwein <mail@reichwein.it>
Date: Sat, 6 Jun 2020 13:58:22 +0200
Subject: Code cleanup, use gcc 8 on debian 10

---
 plugins/cgi/Makefile | 73 ++++++++--------------------------------------------
 1 file changed, 11 insertions(+), 62 deletions(-)

(limited to 'plugins/cgi')

diff --git a/plugins/cgi/Makefile b/plugins/cgi/Makefile
index 2d86c50..df51e89 100644
--- a/plugins/cgi/Makefile
+++ b/plugins/cgi/Makefile
@@ -1,34 +1,12 @@
-DISTROS=debian10
-VERSION=$(shell dpkg-parsechangelog --show-field Version)
-PROJECTNAME=cgi
-
-CXX=clang++-10
-
-ifeq ($(shell which $(CXX)),)
-CXX=clang++
-endif
-
-ifeq ($(shell which $(CXX)),)
-CXX=g++-9
-endif
+include ../../common.mk
 
-ifeq ($(CXXFLAGS),)
-#CXXFLAGS=-O2 -DNDEBUG
-CXXFLAGS=-O0 -g -D_DEBUG
-endif
-# -fprofile-instr-generate -fcoverage-mapping
-# gcc:--coverage
+PROJECTNAME=cgi
 
-CXXFLAGS+= -Wall -I. -I ../..
+CXXFLAGS+= -fvisibility=hidden -fPIC
 
-CXXFLAGS+= -pthread -fvisibility=hidden -fPIC
-ifeq ($(CXX),clang++-10)
-CXXFLAGS+=-std=c++20 #-stdlib=libc++
-else
-CXXFLAGS+=-std=c++17
-endif
+CXXFLAGS+= -I../..
 
-LIBS=\
+LDLIBS=\
 -lcommon \
 -lboost_context \
 -lboost_coroutine \
@@ -41,21 +19,7 @@ LIBS=\
 -lssl -lcrypto \
 -ldl
 
-ifeq ($(CXX),clang++-10)
-LIBS+= \
--fuse-ld=lld-10 \
--lstdc++
-#-lc++ \
-#-lc++abi
-#-lc++fs
-#-lstdc++fs
-else
-LIBS+= \
--lstdc++ \
--lstdc++fs
-endif
-
-LDFLAGS=-L../../libcommon
+LDFLAGS+=-L../../libcommon
 
 PROGSRC=\
     cgi.cpp
@@ -67,6 +31,9 @@ all: $(PROJECTNAME).so
 $(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o)
 	$(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@
 
+../../libcommon/libcommon.a:
+	cd ../.. && $(MAKE) libcommon/libcommon.a
+
 %.d: %.cpp
 	$(CXX) $(CXXFLAGS) -MM -MP -MF $@ -c $<
 
@@ -82,27 +49,9 @@ install:
 	cp $(PROJECTNAME).so $(DESTDIR)/usr/lib/webserver/plugins
 
 # misc ---------------------------------------------------
-deb:
-	# build binary deb package
-	dpkg-buildpackage -us -uc -rfakeroot
-
-deb-src:
-	dpkg-source -b .
-
-$(DISTROS): deb-src
-	sudo pbuilder build --basetgz /var/cache/pbuilder/$@.tgz --buildresult result/$@ ../webserver_$(VERSION).dsc ; \
-
-debs: $(DISTROS)
-
 clean:
+	-rm -f *.o *.so *.d
 
-zip: clean
-	-rm -f ../$(PROJECTNAME).zip
-	zip -r ../$(PROJECTNAME).zip *
-	ls -l ../$(PROJECTNAME).zip
-
-
-
-.PHONY: clean all zip install deb deb-src debs all $(DISTROS)
+.PHONY: clean install all
 
 -include $(wildcard $(SRC:.cpp=.d))
-- 
cgit v1.2.3