From 8db06f5deefc6dd61504e769ee4d534f182c3a77 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 23 Feb 2012 11:50:28 +0000 Subject: [PATCH] Use LIBADD properly, rather than putting libraries in LDFLAGS --- wocky/Makefile.am | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/wocky/Makefile.am b/wocky/Makefile.am index a9805a9..c402f70 100644 --- a/wocky/Makefile.am +++ b/wocky/Makefile.am @@ -217,7 +217,14 @@ AM_CFLAGS = $(ERROR_CFLAGS) $(GCOV_CFLAGS) \ -DWOCKY_COMPILATION -AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @LIBXML2_LIBS@ @SQLITE_LIBS@ @TLS_LIBS@ @LIBIPHB_LIBS@ +libwocky_la_LIBADD = \ + $(GCOV_LIBS) \ + @GLIB_LIBS@ \ + @LIBXML2_LIBS@ \ + @SQLITE_LIBS@ \ + @TLS_LIBS@ \ + @LIBIPHB_LIBS@ \ + $(NULL) # rules for making the glib enum objects # The shell variable $long is something like WOCKY_XMPP_ERROR for @@ -249,5 +256,5 @@ Android.mk: Makefile.am $(built_sources) $(built_headers) -:SOURCES $(handwritten_sources) $(built_sources) \ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ - -:LDFLAGS $(AM_LDFLAGS) \ + -:LDFLAGS $(AM_LDFLAGS) $(libwocky_la_LIBADD) \ > $@ -- 1.7.9.1