diff options
| author | Roland Reichwein <mail@reichwein.it> | 2023-01-03 09:31:51 +0100 |
|---|---|---|
| committer | Roland Reichwein <mail@reichwein.it> | 2023-01-03 09:31:51 +0100 |
| commit | 2b6f8123e925e3be8ce7c04eccdd49fc728314a5 (patch) | |
| tree | 78e86bb428b3bc821ae84d0f6abe86136356bd1a /Makefile | |
| parent | 5581340f23b31114d33736c630de849898668f38 (diff) | |
Separated out libcommon as libreichwein
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 5 insertions, 19 deletions
@@ -2,7 +2,7 @@ include common.mk VERSION=$(shell dpkg-parsechangelog --show-field Version) -DISTROS=base base-i386 debian10 debian11 ubuntu2004 ubuntu2204 +DISTROS=base debian11 ubuntu2204 ubuntu2210 PROJECTNAME=webserver TGZNAME=$(shell ls -t ../webserver-*.tar.xz | head -n1 | sed -e 's,^../,,') PLUGINS= \ @@ -17,7 +17,7 @@ PLUGINS= \ CXXFLAGS+=-fPIE -DVERSION=\"$(VERSION)\" LDLIBS+=\ --lcommon \ +-lreichwein \ -lboost_context \ -lboost_filesystem \ -lboost_timer \ @@ -32,7 +32,7 @@ LDLIBS+=\ #-lboost_thread \ #-lboost_regex \ -LDFLAGS+=-pie -Llibcommon +LDFLAGS+=-pie PROGSRC=\ auth.cpp \ @@ -55,12 +55,9 @@ build: $(PROJECTNAME) $(PLUGINS) all: build ./webserver -c webserver.conf -$(PROJECTNAME): libcommon/libcommon.a $(SRC:.cpp=.o) +$(PROJECTNAME): $(SRC:.cpp=.o) $(CXX) $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@ -libcommon/libcommon.a: - $(MAKE) -C libcommon - $(PLUGINS): cd plugins/$@ && $(MAKE) @@ -117,7 +114,7 @@ clean: -rm -f plugins/*.so -find . -name '*.o' -o -name '*.d' -o -name '*.gcno' -o -name '*.gcda' -o -name '*.so' | xargs rm -f #for i in $(PLUGINS) ; do $(MAKE) -C plugins/$$i clean ; done - for i in libcommon tests ; do $(MAKE) -C $$i clean ; done + $(MAKE) -C tests clean -rm -rf result DISTFILES= \ @@ -170,17 +167,6 @@ DISTFILES= \ debian/webserver.install \ debian/webserver.manpages \ debian/webserver.service \ - libcommon/Makefile \ - libcommon/mime.h \ - libcommon/mime.cpp \ - libcommon/file.h \ - libcommon/file.cpp \ - libcommon/stringutil.h \ - libcommon/stringutil.cpp \ - libcommon/tempfile.h \ - libcommon/tempfile.cpp \ - libcommon/url.h \ - libcommon/url.cpp \ plugins/cgi/cgi.h \ plugins/cgi/Makefile \ plugins/cgi/cgi.cpp \ |