Realize the remaining bits of direct rpmdb interface are dead too

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

diff --git a/Makefile.am b/Makefile.am
index 0cba0c4..70b2501 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,7 @@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
 AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
-AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
-AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
-
-staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\""
 
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
@@ -53,16 +50,17 @@ pkginclude_HEADERS += rpmio/rpmstring.h
 pkginclude_HEADERS += rpmio/rpmsw.h
 pkginclude_HEADERS += rpmio/rpmfileutil.h
 pkginclude_HEADERS += rpmio/rpmutil.h
+pkginclude_HEADERS += rpmio/rpmkeyring.h
 
 pkginclude_HEADERS += lib/header.h
 pkginclude_HEADERS += lib/rpmdb.h
 pkginclude_HEADERS += lib/rpmcallback.h
 pkginclude_HEADERS += lib/rpmcli.h
 pkginclude_HEADERS += lib/rpmlib.h
-pkginclude_HEADERS += lib/rpmal.h
 pkginclude_HEADERS += lib/rpmds.h
 pkginclude_HEADERS += lib/rpmfi.h
 pkginclude_HEADERS += lib/rpmgi.h
+pkginclude_HEADERS += lib/rpmlegacy.h
 pkginclude_HEADERS += lib/rpmps.h
 pkginclude_HEADERS += lib/rpmtag.h
 pkginclude_HEADERS += lib/rpmtd.h
@@ -70,7 +68,6 @@ pkginclude_HEADERS += lib/rpmte.h
 pkginclude_HEADERS += lib/rpmts.h
 pkginclude_HEADERS += lib/rpmtypes.h
 pkginclude_HEADERS += lib/rpmvf.h
-nodist_pkginclude_HEADERS += lib/rpmints.h
 
 pkginclude_HEADERS += build/rpmbuild.h
 pkginclude_HEADERS += build/rpmfc.h
@@ -118,10 +115,6 @@ rpmlibexec_PROGRAMS +=     javadeps
 javadeps_SOURCES =     tools/javadeps.c
 javadeps_LDADD =
 
-rpmlibexec_PROGRAMS += rpmcache
-rpmcache_SOURCES =     tools/rpmcache.c
-rpmcache_LDADD =       lib/librpm.la
-
 rpmlibexec_PROGRAMS += rpmdeps
 rpmdeps_SOURCES =      tools/rpmdeps.c
 rpmdeps_LDADD =                build/librpmbuild.la
@@ -132,15 +125,7 @@ rpmgraph_LDADD =   lib/librpm.la
 
 dist_bin_SCRIPTS =     scripts/gendiff
 
-check_PROGRAMS =       dumpdb
-dumpdb_SOURCES =       tools/dumpdb.c
-dumpdb_LDADD =         lib/librpm.la
-
-check_PROGRAMS +=      convertdb1
-convertdb1_SOURCES =   tools/convertdb1.c
-convertdb1_LDADD =     lib/librpm.la
-
-check_PROGRAMS +=      rpminject
+check_PROGRAMS =       rpminject
 rpminject_SOURCES =    tools/rpminject.c
 rpminject_LDADD =      build/librpmbuild.la
 
@@ -159,11 +144,8 @@ EXTRA_DIST += rpmrc.in
 
 rpmconfig_DATA += macros
 macros: $(top_srcdir)/macros.in
-       @$(SED) \
-         -e "s,[@]varprefix[@],$(localstatedir),g" \
-         < $(top_srcdir)/macros.in > macros.tmp \
-         && ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.tmp )
-CLEANFILES += macros.tmp macros
+         ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.in )
+CLEANFILES += macros
 EXTRA_DIST += macros.in
 
 noinst_DATA = platform
@@ -221,6 +203,7 @@ uninstall-local:
        @rm -f $(DESTDIR)$(bindir)/rpmsign
        @rm -f $(DESTDIR)$(bindir)/rpmverify
        @rm -f $(DESTDIR)$(bindir)/rpmdb
+       @rm -rf $(DESTDIR)$(rpmconfigdir)/platform/
 
 MAINTAINERCLEANFILES = ChangeLog