diff options
| author | Dan McGee <dan@archlinux.org> | 2007-03-12 03:02:57 +0000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-03-12 03:02:57 +0000 |
| commit | ba1806f5aca616390355a4258f7edb43ab8b0b66 (patch) | |
| tree | 9731fe669fd233406a3f118e7e5a3c69a427e13a /src | |
| parent | 9ba23c8248eac4406b374f25feafcad873db89be (diff) | |
| download | pacman-ba1806f5aca616390355a4258f7edb43ab8b0b66.tar.xz | |
* Removed ${CFLAGS} from Makefile.am(s) as it was causing all CFLAGS to be
duplicated.
* Updated the util Makefile.am to link with the proper libalpm.la.
* Fixed bitmasking issues in be_files.c and db.h.
* Rankmirrors updates from James Rosten (with some cleaning up of my own).
KeyboardInterrupts are now handled gracefully.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/Makefile.am | 2 | ||||
| -rw-r--r-- | src/util/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index ee03372d..82ec4d6b 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -10,7 +10,7 @@ localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm -AM_CFLAGS = -D_GNU_SOURCE $(CFLAGS) +AM_CFLAGS = -D_GNU_SOURCE pacman_SOURCES = \ add.h add.c \ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 407eb055..e79e726d 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = vercmp testpkg INCLUDES = -I$(top_srcdir)/lib/libalpm vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm.la +vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la testpkg_SOURCES = testpkg.c -testpkg_LDADD = $(top_builddir)/lib/libalpm/libalpm.la +testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la |