diff options
| author | Roland Reichwein <mail@reichwein.it> | 2020-05-16 13:28:52 +0200 |
|---|---|---|
| committer | Roland Reichwein <mail@reichwein.it> | 2020-05-16 13:28:52 +0200 |
| commit | 6b2a9dabbfad4d64268967a32dff0f1dc55763de (patch) | |
| tree | b3a1f68d8b44090b98ac3bdcf1c8423ebc08c846 /libcommon/Makefile | |
| parent | 83b25165218281c2a2e98b5e72a0375a7e6a71ca (diff) | |
Makefile cleanup, included missing files
Diffstat (limited to 'libcommon/Makefile')
| -rw-r--r-- | libcommon/Makefile | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libcommon/Makefile b/libcommon/Makefile index 932ee90..ab76ed1 100644 --- a/libcommon/Makefile +++ b/libcommon/Makefile @@ -30,8 +30,6 @@ else CXXFLAGS+=-std=c++17 endif -CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock - LIBS=\ -lboost_context \ -lboost_coroutine \ @@ -64,33 +62,18 @@ PROGSRC=\ stringutil.cpp \ tempfile.cpp -TESTSRC=\ - test-webserver.cpp \ - googlemock/src/gmock-all.cpp \ - googletest/src/gtest-all.cpp \ - $(PROGSRC) - SRC=$(PROGSRC) all: $(PROJECTNAME).a -# testsuite ---------------------------------------------- -test-$(PROJECTNAME): $(TESTSRC:.cpp=.o) - $(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@ - $(PROJECTNAME).a: $(SRC:.cpp=.o) ar rcs $@ $^ -dep: $(TESTSRC:.cpp=.d) - %.d: %.cpp - $(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -MM -MP -MF $@ -c $< + $(CXX) $(CXXFLAGS) -MM -MP -MF $@ -c $< %.o: %.cpp %.d - $(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -c $< -o $@ - -googletest/src/%.o: googletest/src/%.cc - $(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -c $< -o $@ + $(CXX) $(CXXFLAGS) -c $< -o $@ # dependencies @@ -111,8 +94,6 @@ $(DISTROS): deb-src debs: $(DISTROS) clean: - -rm -f test-$(PROJECTNAME) $(PROJECTNAME) - -find . -name '*.a' -o -name '*.o' -o -name '*.so' -o -name '*.d' -o -name '*.gcno' -o -name '*.gcda' | xargs rm -f zip: clean -rm -f ../$(PROJECTNAME).zip |