projects / platform / upstream / rpm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace obsoleted "find -perm +NNN" syntax
[platform/upstream/rpm.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 4dae4a3..d9bfc67 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,12 +16,24 @@ SUBDIRS = po misc
 if WITH_INTERNAL_DB
 SUBDIRS += db3
 endif
-if WITH_LUAEXT
+if WITH_LUA
 SUBDIRS += luaext
 endif
-SUBDIRS += rpmio lib build python scripts fileattrs doc . tests plugins
+SUBDIRS += rpmio lib sign build scripts fileattrs doc .
 
-DIST_SUBDIRS = po misc luaext rpmio lib build python scripts fileattrs doc tests plugins
+if ENABLE_PYTHON
+SUBDIRS += python
+endif
+
+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
 
@@ -46,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
@@ -68,7 +82,8 @@ pkginclude_HEADERS += lib/rpmte.h
 pkginclude_HEADERS += lib/rpmts.h
 pkginclude_HEADERS += lib/rpmtypes.h
 pkginclude_HEADERS += lib/rpmvf.h
-pkginclude_HEADERS += lib/rpmplugins.h
+
+pkginclude_HEADERS += sign/rpmsign.h
 
 pkginclude_HEADERS += build/rpmbuild.h
 pkginclude_HEADERS += build/rpmfc.h
@@ -78,13 +93,14 @@ pkginclude_HEADERS += build/rpmspec.h
 rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
 
-bin_PROGRAMS =         rpm2cpio rpmbuild rpmsign
+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
@@ -93,15 +109,27 @@ libcliutils_la_LIBADD =    lib/librpm.la rpmio/librpmio.la
 libcliutils_la_LIBADD +=       @WITH_POPT_LIB@
 
 rpm_SOURCES =          rpmqv.c debug.h system.h
-rpm_CPPFLAGS =         $(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
+rpm_CPPFLAGS =         $(AM_CPPFLAGS) -DIAM_RPMEIU -DIAM_RPMQ -DIAM_RPMV
 rpm_LDADD =            libcliutils.la
-rpm_LDADD +=           build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
+rpm_LDADD +=           lib/librpm.la rpmio/librpmio.la
 rpm_LDADD +=           @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
+rpmdb_SOURCES =                rpmdb.c debug.h system.h
+rpmdb_CPPFLAGS =       $(AM_CPPFLAGS)
+rpmdb_LDADD =          libcliutils.la
+rpmdb_LDADD +=         lib/librpm.la rpmio/librpmio.la
+rpmdb_LDADD +=         @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
+rpmkeys_SOURCES =      rpmkeys.c debug.h system.h
+rpmkeys_CPPFLAGS =     $(AM_CPPFLAGS)
+rpmkeys_LDADD =                libcliutils.la
+rpmkeys_LDADD +=       lib/librpm.la rpmio/librpmio.la
+rpmkeys_LDADD +=       @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
 rpmsign_SOURCES =      rpmsign.c debug.h system.h
 rpmsign_CPPFLAGS =     $(AM_CPPFLAGS)
 rpmsign_LDADD =                libcliutils.la
-rpmsign_LDADD +=       lib/librpm.la rpmio/librpmio.la
+rpmsign_LDADD +=       sign/librpmsign.la lib/librpm.la rpmio/librpmio.la
 rpmsign_LDADD +=       @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
 rpmbuild_SOURCES =     rpmbuild.c debug.h system.h
@@ -110,13 +138,18 @@ rpmbuild_LDADD =  libcliutils.la
 rpmbuild_LDADD +=      build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
 rpmbuild_LDADD +=      @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
+rpmspec_SOURCES =      rpmspec.c debug.h system.h
+rpmspec_CPPFLAGS =     $(AM_CPPFLAGS)
+rpmspec_LDADD =                libcliutils.la
+rpmspec_LDADD +=       build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
+rpmspec_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_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
 
 if LIBELF
-if LIBDWARF
 rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
 
 rpmlibexec_PROGRAMS += debugedit
@@ -129,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
@@ -145,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) \
@@ -182,6 +214,7 @@ rpmconfig_DATA += rpmpopt-$(VERSION)
 rpmpopt-@VERSION@: $(top_srcdir)/rpmpopt.in
        @$(SED) \
          -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
+         -e "s,[@]BINDIR[@],$(bindir),g" \
          < $(top_srcdir)/rpmpopt.in > rpmpopt-@VERSION@.tmp \
          && ( cd $(top_builddir) && ./config.status --file=${subdir}/rpmpopt-@VERSION@:${subdir}/rpmpopt-@VERSION@.tmp )
 CLEANFILES += rpmpopt-@VERSION@.tmp rpmpopt-@VERSION@
@@ -193,25 +226,22 @@ rpmvardir = $(localstatedir)/lib/rpm
 rpmvar_DATA =
 
 install-exec-hook:
-       rm -f $(DESTDIR)$(bindir)/rpmquery
+       @rm -f $(DESTDIR)$(bindir)/rpmquery
        @LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmquery
-       rm -f $(DESTDIR)$(bindir)/rpmverify
+       @rm -f $(DESTDIR)$(bindir)/rpmverify
        @LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmverify
-       rm -f $(DESTDIR)$(bindir)/rpmdb
-       @LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmdb
 
 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...
 uninstall-local:
        @rm -f $(DESTDIR)$(bindir)/rpmquery
        @rm -f $(DESTDIR)$(bindir)/rpmverify
-       @rm -f $(DESTDIR)$(bindir)/rpmdb
        @rm -rf $(DESTDIR)$(rpmconfigdir)/platform/
 
 MAINTAINERCLEANFILES = ChangeLog
Domain: SCM / Build;