switch to using lib instead of *.o

2017-01-22 14:11:15 +01:00
parent caa8fa6ca4
commit 1003912132
2 changed files with 7 additions and 1 deletions
@@ -4,7 +4,7 @@ AM_CXXFLAGS = -Wno-unused-parameter \
 noinst_PROGRAMS = test_contrib

 test_contrib_SOURCES = test_tem.cpp
-test_contrib_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
+test_contrib_LDADD = ../../libebus.a ../libebuscontrib.a

 distclean-local:
 	-rm -f Makefile.in
@@ -21,6 +21,12 @@ test_data_LDADD = ../libebus.a
 test_message_SOURCES = test_message.cpp
 test_message_LDADD = ../libebus.a

+if CONTRIB
+test_device_LDADD += ../contrib/libebuscontrib.a
+test_data_LDADD += ../contrib/libebuscontrib.a
+test_message_LDADD += ../contrib/libebuscontrib.a
+endif
+
 distclean-local:
 	-rm -f Makefile.in
 	-rm -rf .libs