diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-02-10 10:52:40 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-02-10 11:20:51 +0200 |
| commit | 87c237bebfc792a8b439fa2c5a2b78328b139d50 (patch) | |
| tree | 6f4368c590cff4f3c2e60bb3510ebe10e67db77c /Makefile.am | |
| parent | a79822f382c2e9e5002e7b411fa556c999fdc331 (diff) | |
| download | rpm-87c237bebfc792a8b439fa2c5a2b78328b139d50.tar.gz rpm-87c237bebfc792a8b439fa2c5a2b78328b139d50.tar.bz2 rpm-87c237bebfc792a8b439fa2c5a2b78328b139d50.zip | |
Split elf dependency extraction out of librpmbuild to external helper
- Elf dependency extraction code code lifted from rpmfcELF() and refactored
to saner pieces. Having it in separate executable also frees librpmbuild
of libelf dependency, clean up the unnecessary linkage etc from
autofoo
- This lets internal dependency generator for elf files be
overridden without losing file coloring (which is required for
correct multilib handling). It also permits non-native elf files
(eg when cross-building) to be handled by providing a custom
elf dependency helper
- On the flip side, this inevitably slows down builds somewhat as
two fork-exec's are needed for every elf file, but unlike invoking
something like the python interpreter, this is a slim helper...
- All dependency extractors of the internal dependency generator are now
external helpers (how twisted is that, huh? :) and thus can be customized
and filtered through %__foo_provides|requires macros
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 587cfa793..eff20d70e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/rpmio AM_CPPFLAGS += @WITH_NSS_INCLUDE@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@ AM_CPPFLAGS += -I$(top_srcdir)/misc -AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@ AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\"" @@ -88,16 +87,16 @@ DISTCLEANFILES += find-requires rpm_SOURCES = rpmqv.c debug.h system.h rpm_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV rpm_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la -rpm_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ +rpm_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ rpmbuild_SOURCES = build.c rpmqv.c build.h debug.h system.h rpmbuild_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMBT rpmbuild_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la -rpmbuild_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ +rpmbuild_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ rpm2cpio_SOURCES = rpm2cpio.c debug.h system.h rpm2cpio_LDADD = lib/librpm.la rpmio/librpmio.la -rpm2cpio_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ +rpm2cpio_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ if LIBELF @@ -108,6 +107,11 @@ rpmlibexec_PROGRAMS += debugedit debugedit_SOURCES = tools/debugedit.c tools/hashtab.c tools/hashtab.h debugedit_LDADD = rpmio/librpmio.la debugedit_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@ + +rpmlibexec_PROGRAMS += elfdeps +elfdeps_SOURCES = tools/elfdeps.c +elfdeps_LDADD = rpmio/librpmio.la +elfdeps_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@ endif endif |