[4.0] Use strip (instead of eu-strip) to support --strip-debug of *.so at build time

[platform/upstream/rpm.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1bcd7c..d9bfc67 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,10 @@ SUBDIRS = po misc
 if WITH_INTERNAL_DB
 SUBDIRS += db3
 endif
-if WITH_LUAEXT
+if WITH_LUA
 SUBDIRS += luaext
 endif
-SUBDIRS += rpmio lib sign build scripts fileattrs doc . tests
+SUBDIRS += rpmio lib sign build scripts fileattrs doc .
 
 if ENABLE_PYTHON
 SUBDIRS += python
@@ -29,6 +29,10 @@ if ENABLE_PLUGINS
 SUBDIRS += plugins
 endif
 
+if HAVE_FAKECHROOT
+SUBDIRS += tests
+endif
+
 DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs doc tests plugins
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -54,10 +58,12 @@ pkginclude_HEADERS += rpmio/rpmlog.h
 pkginclude_HEADERS += rpmio/rpmpgp.h
 pkginclude_HEADERS += rpmio/rpmsq.h
 pkginclude_HEADERS += rpmio/rpmstring.h
+pkginclude_HEADERS += rpmio/rpmstrpool.h
 pkginclude_HEADERS += rpmio/rpmsw.h
 pkginclude_HEADERS += rpmio/rpmfileutil.h
 pkginclude_HEADERS += rpmio/rpmutil.h
 pkginclude_HEADERS += rpmio/rpmkeyring.h
+pkginclude_HEADERS += rpmio/rpmbase64.h
 
 pkginclude_HEADERS += lib/header.h
 pkginclude_HEADERS += lib/rpmdb.h
@@ -90,10 +96,11 @@ rpmbin_PROGRAMS = rpm
 bin_PROGRAMS =         rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
 
 rpmlibexec_PROGRAMS =
-rpmconfig_SCRIPTS =    find-provides find-requires mkinstalldirs \
+rpmconfig_SCRIPTS =    autodeps/find-provides autodeps/find-requires \
+                       mkinstalldirs \
                        config.guess config.sub
-DISTCLEANFILES = find-provides
-DISTCLEANFILES += find-requires
+DISTCLEANFILES = autodeps/find-provides
+DISTCLEANFILES += autodeps/find-requires
 
 noinst_LTLIBRARIES =           libcliutils.la
 libcliutils_la_SOURCES =       cliutils.h cliutils.c
@@ -143,7 +150,6 @@ rpm2cpio_LDADD +=   @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
 
 if LIBELF
-if LIBDWARF
 rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
 
 rpmlibexec_PROGRAMS += debugedit
@@ -156,11 +162,6 @@ elfdeps_SOURCES =  tools/elfdeps.c
 elfdeps_LDADD =                rpmio/librpmio.la
 elfdeps_LDADD +=       @WITH_LIBELF_LIB@ @WITH_POPT_LIB@
 endif
-endif
-
-rpmlibexec_PROGRAMS += javadeps
-javadeps_SOURCES =     tools/javadeps.c
-javadeps_LDADD =
 
 rpmlibexec_PROGRAMS += rpmdeps
 rpmdeps_SOURCES =      tools/rpmdeps.c
@@ -172,6 +173,10 @@ rpmgraph_LDADD =   lib/librpm.la rpmio/librpmio.la @WITH_POPT_LIB@
 
 dist_bin_SCRIPTS =     scripts/gendiff
 
+bin_PROGRAMS +=                rpmqpack
+rpmqpack_SOURCES =      rpmqpack.c
+rpmqpack_LDADD =        lib/librpm.la
+
 rpmconfig_DATA = rpmrc
 rpmrc: $(top_srcdir)/rpmrc.in
        @$(SED) \
@@ -227,10 +232,10 @@ install-exec-hook:
        @LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmverify
 
 install-data-local:
-       @case "@host_os@" in \
-       solaris*|linux*|darwin*) \
-          DESTDIR="$(DESTDIR)" pkglibdir="$(rpmconfigdir)" $(SHELL) $(top_srcdir)/installplatform rpmrc macros platform ;; \
-       esac
+       DESTDIR="$(DESTDIR)" pkglibdir="$(rpmconfigdir)" \
+               $(SHELL) $(top_srcdir)/installplatform \
+                       rpmrc platform \
+                       $(RPMCANONVENDOR) $(RPMCANONOS) $(RPMCANONGNU)
        @$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp
 
 # XXX to appease distcheck we need to remove "stuff" here...