diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-31 07:41:42 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-31 07:41:42 +0100 |
| commit | 5a8bbc99be0ec8ea264fca061276e9ec798bca5e (patch) | |
| tree | 0107af1d7d04ba0d67d6cf69d0b8bf1746f6137f /src/pacman/Makefile.am | |
| parent | af2fb3324a925af6caa9d53aacac92173fc47885 (diff) | |
| download | pacman-5a8bbc99be0ec8ea264fca061276e9ec798bca5e.tar.gz pacman-5a8bbc99be0ec8ea264fca061276e9ec798bca5e.tar.xz | |
Numerous changes:
* Added 'ILoveCandy' support to all progress bars
* Changed download callback with regards to libfetch libalpm changes
* libfetch error output on failed sync
* Misc others I may have forgot to name (check the diff, heh)
Diffstat (limited to 'src/pacman/Makefile.am')
| -rw-r--r-- | src/pacman/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 6b5f8bc1..fdfac1eb 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -7,17 +7,19 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ AM_CFLAGS = -D_GNU_SOURCE \ -I$(top_srcdir)/lib/libalpm \ - -I$(top_srcdir)/lib/libftp + -I$(top_srcdir)/lib/libfetch pacman_SOURCES = util.c log.c list.c package.c download.c trans.c add.c \ remove.c upgrade.c query.c sync.c conf.c deptest.c pacman.c pacman_static_SOURCES = $(pacman_SOURCES) -pacman_LDADD = \ - $(top_srcdir)/lib/libalpm/libalpm.la +pacman_LDADD = -L$(top_srcdir)/lib/libalpm/.libs \ + -L$(top_srcdir)/lib/libfetch -lfetch \ + -larchive -lm -lalpm -lssl -lcrypto -pacman_static_LDADD = \ - $(top_srcdir)/lib/libalpm/.libs/libalpm.a $(LDFLAGS) +pacman_static_LDADD = -L$(top_srcdir)/lib/libalpm/.libs/ \ + -L$(top_srcdir)/lib/libfetch -lfetch \ + -larchive -lm -lalpm -lssl -lcrypto -pacman_static_LDFLAGS = -all-static +pacman_static_LDFLAGS = $(LDFLAGS) -all-static |