From 3e1b72f4f2b3f8766f9ad3493ad736d81263c9c1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 26 Oct 2007 20:40:20 -0500 Subject: Clean up LDADD usage We had a lot of unnecessary overstatements of libraries to include on linking, and autoconf/automake takes care of this for us. This also helps some compilation issues on other platforms. Signed-off-by: Dan McGee --- lib/libalpm/Makefile.am | 1 - src/pacman/Makefile.am | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 49ce14c6..e42a0bd0 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -34,6 +34,5 @@ libalpm_la_SOURCES = \ util.h util.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) -libalpm_la_LIBADD = -larchive -ldownload # vim:set ts=2 sw=2 noet: diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 939ff197..4fe8b4fd 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -27,12 +27,10 @@ pacman_SOURCES = \ callback.h callback.c \ util.h util.c -pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ - -ldownload -lm +pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la pacman_static_SOURCES = $(pacman_SOURCES) pacman_static_LDFLAGS = $(LDFLAGS) -all-static -pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ - -ldownload -lm +pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la # vim:set ts=2 sw=2 noet: -- cgit v1.2.3-70-g09d2