Timeout fixed, proto starting and stopping added

[stg.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 56d7d95d2a613ca0d0f19eadb3e7c6a48b080aea..0635185c09e2dc4155887da33c679ff4a4d6f33c 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS+=-g3 -Wall -W -pedantic -DLINUX -I../include -I../projects/stargazer -I../stglibs/conffiles.lib
+CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I.

 LIBS=-lpthread
 PROG=tests
 
 LIBS=-lpthread
 PROG=tests
 


@@ -7,8 +7,9 @@ SOURCES=main.cpp \
        test_admin_conf.cpp \
        test_tariff.cpp \
        test_conffiles.cpp \
        test_admin_conf.cpp \
        test_tariff.cpp \
        test_conffiles.cpp \

-       ../projects/stargazer/tariff.cpp \
-       ../stglibs/conffiles.lib/conffiles.cpp
+       ../projects/stargazer/tariff_impl.cpp \
+       ../stglibs/conffiles.lib/conffiles.cpp \
+       ../stglibs/common.lib/common.cpp

 
 all: $(PROG) 
 
 
 all: $(PROG) 
 


@@ -16,7 +17,7 @@ $(PROG): $(subst .cpp,.o,$(SOURCES))
        $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
 
 clean:
        $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
 
 clean:

-       rm -f *.o *.d
+       rm -f *.o *.d $(PROG)

 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)