From 87b30afcec46b4c76c50b5b283796e2b062c88a0 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 22 Jan 2017 13:54:29 +0100 Subject: [PATCH] switch to using lib instead of *.o --- src/ebusd/Makefile.am | 4 ++++ src/lib/ebus/Makefile.am | 4 +--- src/tools/Makefile.am | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am index 4fbff921..99cc4645 100644 --- a/src/ebusd/Makefile.am +++ b/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 diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am index 9f15bfb6..a9050dcd 100644 --- a/src/lib/ebus/Makefile.am +++ b/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: diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index f52008ea..1d14bde5 100644 --- a/src/tools/Makefile.am +++ b/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