From 2be63668af1cadf846ae2d44a0fd5c909ceaf47e Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sat, 4 Apr 2020 11:32:54 +0200 Subject: Add plugins --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bb93b0d..65c3ada 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ CXX=clang++ endif ifeq ($(shell which $(CXX)),) -CXX=g++-9 +#CXX=g++-9 endif ifeq ($(CXXFLAGS),) @@ -23,7 +23,7 @@ CXXFLAGS+= -Wall -I. CXXFLAGS+= -pthread ifeq ($(CXX),clang++-10) -CXXFLAGS+=-std=c++20 -stdlib=libc++ +CXXFLAGS+=-std=c++20 #-stdlib=libc++ else CXXFLAGS+=-std=c++2a endif @@ -39,16 +39,17 @@ LIBS=\ -lboost_filesystem \ -lboost_regex \ -lpthread \ --lssl -lcrypto +-lssl -lcrypto \ +-ldl ifeq ($(CXX),clang++-10) LIBS+= \ -fuse-ld=lld-10 \ --lc++ \ --lc++abi +-lstdc++ +#-lc++ \ +#-lc++abi #-lc++fs -#-lstdc++ \ -#-lstdc++fs \ +#-lstdc++fs else LIBS+= \ -lstdc++ @@ -58,7 +59,8 @@ endif PROGSRC=\ config.cpp \ http.cpp \ - http_debian10.cpp + http_debian10.cpp \ + plugin.cpp TESTSRC=\ test-webserver.cpp \ @@ -68,7 +70,7 @@ TESTSRC=\ SRC=$(PROGSRC) webserver.cpp -all: test-$(PROJECTNAME) $(PROJECTNAME) +all: $(PROJECTNAME) test-$(PROJECTNAME) ./test-$(PROJECTNAME) ./webserver -c webserver.conf @@ -126,8 +128,6 @@ zip: clean zip -r ../$(PROJECTNAME).zip * ls -l ../$(PROJECTNAME).zip - - .PHONY: clean all zip install deb deb-src debs all $(DISTROS) -include $(wildcard $(SRC:.cpp=.d)) -- cgit v1.2.3