diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/cgi/Makefile | 9 | ||||
| -rw-r--r-- | plugins/cgi/cgi.cpp | 2 | ||||
| -rw-r--r-- | plugins/fcgi/Makefile | 5 | ||||
| -rw-r--r-- | plugins/redirect/Makefile | 5 | ||||
| -rw-r--r-- | plugins/static-files/Makefile | 8 | ||||
| -rw-r--r-- | plugins/static-files/static-files.cpp | 4 | ||||
| -rw-r--r-- | plugins/statistics/Makefile | 8 | ||||
| -rw-r--r-- | plugins/statistics/statistics.cpp | 4 | ||||
| -rw-r--r-- | plugins/webbox/Makefile | 8 | ||||
| -rw-r--r-- | plugins/webbox/webbox.cpp | 10 | ||||
| -rw-r--r-- | plugins/weblog/Makefile | 8 | ||||
| -rw-r--r-- | plugins/weblog/weblog.cpp | 4 |
12 files changed, 18 insertions, 57 deletions
diff --git a/plugins/cgi/Makefile b/plugins/cgi/Makefile index df51e89..fd8e98d 100644 --- a/plugins/cgi/Makefile +++ b/plugins/cgi/Makefile @@ -7,7 +7,7 @@ CXXFLAGS+= -fvisibility=hidden -fPIC CXXFLAGS+= -I../.. LDLIBS=\ --lcommon \ +-lreichwein \ -lboost_context \ -lboost_coroutine \ -lboost_program_options \ @@ -19,8 +19,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ cgi.cpp @@ -28,12 +26,9 @@ SRC=$(PROGSRC) all: $(PROJECTNAME).so -$(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o) +$(PROJECTNAME).so: $(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 $< diff --git a/plugins/cgi/cgi.cpp b/plugins/cgi/cgi.cpp index b2af9fa..4e4f6c7 100644 --- a/plugins/cgi/cgi.cpp +++ b/plugins/cgi/cgi.cpp @@ -1,6 +1,6 @@ #include "cgi.h" -#include "libcommon/mime.h" +#include "libreichwein/mime.h" #include <boost/algorithm/string/predicate.hpp> #include <boost/coroutine2/coroutine.hpp> diff --git a/plugins/fcgi/Makefile b/plugins/fcgi/Makefile index d3b8ed1..32a8bda 100644 --- a/plugins/fcgi/Makefile +++ b/plugins/fcgi/Makefile @@ -18,8 +18,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ fcgi.cpp \ fcgiid.cpp \ @@ -32,9 +30,6 @@ all: $(PROJECTNAME).so $(PROJECTNAME).so: $(SRC:.cpp=.o) $(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@ -../../libcommon/libcommon.a: - cd ../.. && $(MAKE) libcommon/libcommon.a - %.d: %.cpp $(CXX) $(CXXFLAGS) -MM -MP -MF $@ -c $< diff --git a/plugins/redirect/Makefile b/plugins/redirect/Makefile index 344aa91..7c37228 100644 --- a/plugins/redirect/Makefile +++ b/plugins/redirect/Makefile @@ -18,8 +18,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ redirect.cpp @@ -30,9 +28,6 @@ all: $(PROJECTNAME).so $(PROJECTNAME).so: $(SRC:.cpp=.o) $(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@ -../../libcommon/libcommon.a: - cd ../.. && $(MAKE) libcommon/libcommon.a - %.d: %.cpp $(CXX) $(CXXFLAGS) -MM -MP -MF $@ -c $< diff --git a/plugins/static-files/Makefile b/plugins/static-files/Makefile index 7c817fb..689d085 100644 --- a/plugins/static-files/Makefile +++ b/plugins/static-files/Makefile @@ -7,7 +7,6 @@ CXXFLAGS+= -fvisibility=hidden -fPIC CXXFLAGS+= -I../.. LDLIBS=\ --lcommon \ -lboost_context \ -lboost_coroutine \ -lboost_program_options \ @@ -19,8 +18,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ static-files.cpp @@ -28,12 +25,9 @@ SRC=$(PROGSRC) all: $(PROJECTNAME).so -$(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o) +$(PROJECTNAME).so: $(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 $< diff --git a/plugins/static-files/static-files.cpp b/plugins/static-files/static-files.cpp index ad78e48..e889bc5 100644 --- a/plugins/static-files/static-files.cpp +++ b/plugins/static-files/static-files.cpp @@ -1,7 +1,7 @@ #include "static-files.h" -#include "libcommon/mime.h" -#include "libcommon/url.h" +#include "libreichwein/mime.h" +#include "libreichwein/url.h" #include <boost/algorithm/string/predicate.hpp> diff --git a/plugins/statistics/Makefile b/plugins/statistics/Makefile index 26032c3..cece45e 100644 --- a/plugins/statistics/Makefile +++ b/plugins/statistics/Makefile @@ -7,7 +7,6 @@ CXXFLAGS+= -fvisibility=hidden -fPIC CXXFLAGS+= -I../.. LDLIBS=\ --lcommon \ -lboost_context \ -lboost_coroutine \ -lboost_program_options \ @@ -19,8 +18,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ statistics.cpp @@ -28,12 +25,9 @@ SRC=$(PROGSRC) all: $(PROJECTNAME).so -$(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o) +$(PROJECTNAME).so: $(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 $< diff --git a/plugins/statistics/statistics.cpp b/plugins/statistics/statistics.cpp index 415369d..54450a8 100644 --- a/plugins/statistics/statistics.cpp +++ b/plugins/statistics/statistics.cpp @@ -1,7 +1,7 @@ #include "statistics.h" -#include "libcommon/file.h" -#include "libcommon/tempfile.h" +#include "libreichwein/file.h" +#include "libreichwein/tempfile.h" #include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/split.hpp> diff --git a/plugins/webbox/Makefile b/plugins/webbox/Makefile index 4be08d1..5e4dab8 100644 --- a/plugins/webbox/Makefile +++ b/plugins/webbox/Makefile @@ -7,7 +7,6 @@ CXXFLAGS+= -fvisibility=hidden -fPIC CXXFLAGS+= -I../.. LDLIBS=\ --lcommon \ -lboost_context \ -lboost_coroutine \ -lboost_program_options \ @@ -19,8 +18,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ webbox.cpp @@ -28,12 +25,9 @@ SRC=$(PROGSRC) all: $(PROJECTNAME).so -$(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o) +$(PROJECTNAME).so: $(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 $< diff --git a/plugins/webbox/webbox.cpp b/plugins/webbox/webbox.cpp index ac54394..90975b5 100644 --- a/plugins/webbox/webbox.cpp +++ b/plugins/webbox/webbox.cpp @@ -1,10 +1,10 @@ #include "webbox.h" -#include "libcommon/mime.h" -#include "libcommon/tempfile.h" -#include "libcommon/file.h" -#include "libcommon/stringutil.h" -#include "libcommon/url.h" +#include "libreichwein/mime.h" +#include "libreichwein/tempfile.h" +#include "libreichwein/file.h" +#include "libreichwein/stringutil.h" +#include "libreichwein/url.h" #include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/replace.hpp> diff --git a/plugins/weblog/Makefile b/plugins/weblog/Makefile index 6cec97a..710a3cd 100644 --- a/plugins/weblog/Makefile +++ b/plugins/weblog/Makefile @@ -7,7 +7,6 @@ CXXFLAGS+= -fvisibility=hidden -fPIC CXXFLAGS+= -I../.. LDLIBS=\ --lcommon \ -lboost_context \ -lboost_coroutine \ -lboost_program_options \ @@ -19,8 +18,6 @@ LDLIBS=\ -lssl -lcrypto \ -ldl -LDFLAGS+=-L../../libcommon - PROGSRC=\ weblog.cpp @@ -28,12 +25,9 @@ SRC=$(PROGSRC) all: $(PROJECTNAME).so -$(PROJECTNAME).so: ../../libcommon/libcommon.a $(SRC:.cpp=.o) +$(PROJECTNAME).so: $(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 $< diff --git a/plugins/weblog/weblog.cpp b/plugins/weblog/weblog.cpp index c26a4fe..8be5b40 100644 --- a/plugins/weblog/weblog.cpp +++ b/plugins/weblog/weblog.cpp @@ -1,7 +1,7 @@ #include "weblog.h" -#include "libcommon/mime.h" -#include "libcommon/stringutil.h" +#include "libreichwein/mime.h" +#include "libreichwein/stringutil.h" #include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/replace.hpp> |