From c06eb12d69928b2c0affd509692ca2ed6696d172 Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Fri, 11 Sep 2020 17:59:35 +0200 Subject: [PATCH] Removed helper lib from unittest --- tests/helperlib/Makefile | 7 ++++--- tests/helperlib/Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/helperlib/Makefile b/tests/helperlib/Makefile index 35e694d75..6da109f65 100644 --- a/tests/helperlib/Makefile +++ b/tests/helperlib/Makefile @@ -107,7 +107,8 @@ CONNECT_TEST_OBJECTS = connect_test.o \ ### Targets: ### -all: unittest connect_test +all: unittest +#all: unittest connect_test unittest.o: unittest.cpp unittest.h $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c unittest.cpp -o $@ $(EXTRALIBS) @@ -157,8 +158,8 @@ fastpbkdf2.o: ../../src/common/fastpbkdf2.c ../../src/common/fastpbkdf2.h vscpmd5.o: ../../src/common/vscpmd5.c ../../src/common/vscpmd5.h $(CC) $(CFLAGS) -c ../../src/common/vscpmd5.c -o $@ -connect_test: $(CONNECT_TEST_OBJECTS) - $(CXX) -o $@ $(CONNECT_TEST_OBJECTS) $(LDFLAGS) $(EXTRALIBS) +#connect_test: $(CONNECT_TEST_OBJECTS) +# $(CXX) -o $@ $(CONNECT_TEST_OBJECTS) $(LDFLAGS) $(EXTRALIBS) unittest: $(UNITTEST_OBJECTS) $(CXX) -o $@ $(UNITTEST_OBJECTS) $(LDFLAGS) $(EXTRALIBS) diff --git a/tests/helperlib/Makefile.in b/tests/helperlib/Makefile.in index d7f011b73..fb1e54d88 100644 --- a/tests/helperlib/Makefile.in +++ b/tests/helperlib/Makefile.in @@ -51,7 +51,7 @@ CPPFLAGS = @CPPFLAGS@ ${WARNINGS} -fno-var-tracking-assignments -I@top_srcdir@ \ LDFLAGS = @LDFLAGS@ -EXTRALIBS = @EXTRALIBS@ -L../../googletest/build/lib -lgtest -lgtest_main -lvscphelper +EXTRALIBS = @EXTRALIBS@ -L../../googletest/build/lib -lgtest -lgtest_main DESTDIR=@DESTDIR@ prefix = @prefix@ @@ -105,16 +105,16 @@ CONNECT_TEST_OBJECTS = connect_test.o \ vscpbase64.o \ vscpdatetime.o -### Targets: ### +### Targets: ### all: unittest connect_test all: unittest -#all: unittest connect_test + unittest.o: unittest.cpp unittest.h $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c unittest.cpp -o $@ $(EXTRALIBS) connect_test.o: connect_test.cpp connect_test.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c connect_test.cpp -o $@ $(EXTRALIBS) + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c connect_test.cpp -o $@ $(EXTRALIBS) -lvscphelper vscphelper.o: ../../src/vscp/common/vscphelper.cpp ../../src/vscp/common/vscphelper.h $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ../../src/vscp/common/vscphelper.cpp -o $@