Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7c75056db634265f456f97371bd37f2ecd00788c
commit 7c75056db634265f456f97371bd37f2ecd00788c Author: Michel Hermier <[EMAIL PROTECTED]> Date: Fri Nov 2 22:09:35 2007 +0100 pacman-g2 * Partial fix for out of the source builds (documentation still fails). * Moved an LDFLAGS from _LDADD to _LDFLAGS, sounds more logical. diff --git a/Makefile.am b/Makefile.am index fa1442a..f47e77c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libftp lib/libpacman src/vercmp src/pacman-g2 scripts doc doc/hu etc +SUBDIRS = lib/libftp lib/libpacman src/vercmp src/versort src/pacman-g2 scripts doc doc/hu etc if HAS_PERL SUBDIRS += bindings/perl diff --git a/lib/libpacman/Makefile.am b/lib/libpacman/Makefile.am index 25e2d38..514966a 100644 --- a/lib/libpacman/Makefile.am +++ b/lib/libpacman/Makefile.am @@ -39,7 +39,7 @@ include_HEADERS = pacman.h libpacman_la_SOURCES = $(TARGETS) libpacman_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO) -libpacman_la_LIBADD = $(top_srcdir)/lib/libftp/libftp.la +libpacman_la_LIBADD = $(top_builddir)/lib/libftp/libftp.la if HAS_DOXYGEN all: doxygen.in diff --git a/src/pacman-g2/Makefile.am b/src/pacman-g2/Makefile.am index 839b558..3eed4ad 100644 --- a/src/pacman-g2/Makefile.am +++ b/src/pacman-g2/Makefile.am @@ -18,12 +18,12 @@ pacman_g2_SOURCES = util.c log.c list.c package.c download.c trans.c add.c \ pacman_g2_static_SOURCES = $(pacman_g2_SOURCES) pacman_g2_LDADD = \ - $(top_srcdir)/lib/libpacman/libpacman.la + $(top_builddir)/lib/libpacman/libpacman.la -pacman_g2_static_LDADD = \ - $(top_srcdir)/lib/libpacman/.libs/libpacman.a $(LDFLAGS) +pacman_g2_static_LDADD = $(pacman_g2_LDADD) -pacman_g2_static_LDFLAGS = -all-static +pacman_g2_static_LDFLAGS = -all-static $(LDFLAGS) install-exec-hook: ln -s pacman-g2 $(DESTDIR)$(bindir)/pacman + diff --git a/src/vercmp/Makefile.am b/src/vercmp/Makefile.am index cd247a1..fcdc9c3 100644 --- a/src/vercmp/Makefile.am +++ b/src/vercmp/Makefile.am @@ -6,5 +6,6 @@ AM_CFLAGS = \ vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_srcdir)/lib/libpacman/libpacman.la \ - $(top_srcdir)/lib/libftp/libftp.la +vercmp_LDADD = \ + $(top_builddir)/lib/libpacman/libpacman.la \ + $(top_builddir)/lib/libftp/libftp.la _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
