switch to using lib instead of *.o

src/ebusd/Makefile.am

@@ -26,6 +26,10 @@ ebusd_LDADD = ../lib/utils/libutils.a \
 	      -lpthread \
 	      @EXTRA_LIBS@
 
+if CONTRIB
+ebusd_LDADD += ../lib/ebus/contrib/libebuscontrib.a
+endif
+
 distclean-local:
 	-rm -f Makefile.in
 	-rm -rf .libs

src/lib/ebus/Makefile.am

@@ -1,5 +1,4 @@
-AM_CXXFLAGS = -Wno-unused-parameter \
-	      -Wconversion
+AM_CXXFLAGS = -Wconversion -Wno-unused-parameter
 
 noinst_LIBRARIES = libebus.a
 
@@ -19,7 +18,6 @@ libebus_a_SOURCES = result.cpp \
 
 if CONTRIB
 SUBDIRS = contrib
-libebus_a_LIBADD = contrib/*.o
 endif
 
 distclean-local:

src/tools/Makefile.am

@@ -11,6 +11,10 @@ ebusfeed_SOURCES = ebusfeed.cpp
 ebusfeed_LDADD = ../lib/utils/libutils.a \
 	         ../lib/ebus/libebus.a
 
+if CONTRIB
+ebusfeed_LDADD += ../lib/ebus/contrib/libebuscontrib.a
+endif
+
 distclean-local:
 	-rm -f Makefile.in
 	-rm -rf .libs