folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup paths and Makefiles for rpmdb/ elimination

This commit is contained in:
Panu Matilainen 2008-05-12 12:28:12 +03:00
parent a68a5a049e
commit 90e10708f8
32 changed files with 208 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile.am
View File

@ -19,16 +19,15 @@ endif
if WITH_LUAEXT
SUBDIRS += luaext
endif
SUBDIRS += rpmio rpmdb lib build python scripts doc . tests
SUBDIRS += rpmio lib build python scripts doc . tests
DIST_SUBDIRS = po misc luaext rpmio rpmdb lib build python scripts doc tests
DIST_SUBDIRS = po misc luaext rpmio lib build python scripts doc tests
pkgconfigdir = $(libdir)/pkgconfig
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += -I$(top_srcdir)/build
AM_CPPFLAGS += -I$(top_srcdir)/lib
AM_CPPFLAGS += -I$(top_builddir)/rpmdb -I$(top_srcdir)/rpmdb
AM_CPPFLAGS += -I$(top_srcdir)/rpmio
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
@ -55,10 +54,8 @@ pkginclude_HEADERS += rpmio/rpmsw.h
pkginclude_HEADERS += rpmio/rpmfileutil.h
pkginclude_HEADERS += rpmio/rpmutil.h
pkginclude_HEADERS += rpmdb/header.h
pkginclude_HEADERS += rpmdb/rpmdb.h
nodist_pkginclude_HEADERS += rpmdb/rpmints.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
@ -72,6 +69,7 @@ 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
@ -91,36 +89,36 @@ 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 rpmdb/librpmdb.la rpmio/librpmio.la
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@
rpmb_SOURCES = build.c rpmqv.c build.h debug.h system.h
rpmb_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMBT
rpmb_LDADD = build/librpmbuild.la lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la
rpmb_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
rpmb_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmd_SOURCES = rpmqv.c debug.h system.h
rpmd_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMDB
rpmd_LDADD = lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la
rpmd_LDADD = lib/librpm.la rpmio/librpmio.la
rpmd_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmi_SOURCES = rpmqv.c debug.h system.h
rpmi_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMEIU
rpmi_LDADD = lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la
rpmi_LDADD = lib/librpm.la rpmio/librpmio.la
rpmi_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmk_SOURCES = rpmqv.c debug.h system.h
rpmk_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMK
rpmk_LDADD = lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la
rpmk_LDADD = lib/librpm.la rpmio/librpmio.la
rpmk_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmq_SOURCES = rpmqv.c debug.h system.h
rpmq_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMQV
rpmq_LDADD = build/librpmbuild.la lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la
rpmq_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
rpmq_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpm2cpio_SOURCES = rpm2cpio.c debug.h system.h
rpm2cpio_LDADD = lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la
rpm2cpio_LDADD = lib/librpm.la rpmio/librpmio.la
rpm2cpio_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@

1
build/Makefile.am
View File

@ -17,7 +17,6 @@ librpmbuild_la_SOURCES = \
librpmbuild_la_LDFLAGS = -release 4.6
librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
@WITH_POPT_LIB@ \
@WITH_LIBELF_LIB@ \

4
configure.ac
View File

@ -1028,10 +1028,10 @@ AC_DEFINE([__RPM_USES_STDINT_H__],[1],[if rpm uses stdint.h])
AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
AC_CONFIG_HEADERS([rpmdb/rpmints.h])
AC_CONFIG_HEADERS([lib/rpmints.h])
AC_CONFIG_FILES([Makefile
rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
rpmio/Makefile lib/Makefile build/Makefile
po/Makefile.in scripts/Makefile
misc/Makefile
doc/Makefile

141
lib/Makefile.am
View File

@ -1,8 +1,11 @@
# Makefile for rpm library.
include $(top_srcdir)/rpm.am
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += @WITH_SQLITE3_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
AM_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\""
@ -11,10 +14,17 @@ AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
check_PROGRAMS =
CLEANFILES =
EXTRA_DIST = gentagtbl.sh
EXTRA_PROGRAMS =
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpm.la
librpm_la_SOURCES = \
backend/dbconfig.c backend/db3.c \
hdrNVR.c header.c header_internal.c header_internal.h \
poptDB.c rpmhash.c rpmhash.h rpmdb.c rpmdb_internal.h \
fprint.c fprint.h tagname.c tagtbl.c \
cpio.c cpio.h depends.c formats.c fs.c fsm.c fsm.h \
manifest.c manifest.h misc.c package.c \
poptALL.c poptI.c poptQV.c psm.c psm.h query.c \
@ -24,15 +34,142 @@ librpm_la_SOURCES = \
rpmte.c rpmte_internal.h rpmts.c \
rpmvercmp.c signature.c signature.h transaction.c \
verify.c rpmlock.c rpmlock.h misc.h \
legacy.c legacy.h
legacy.c legacy.h merge.c
if SQLITE3
librpm_la_SOURCES += backend/sqlite.c
endif
librpm_la_LDFLAGS = -release 4.6
librpm_la_LIBADD = \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
@WITH_NSS_LIB@ \
@WITH_POPT_LIB@ \
@WITH_SELINUX_LIB@ \
@WITH_SQLITE3_LIB@ \
@LIBINTL@
if WITH_INTERNAL_DB
librpm_la_LIBADD += $(libdb_la)
else
librpm_la_LIBADD += @WITH_DB_LIB@
endif
tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmtag.h gentagtbl.sh
@AWK=${AWK} ${SHELL} gentagtbl.sh $(top_srcdir)/lib/rpmtag.h > $@
BUILT_SOURCES = tagtbl.c
if WITH_INTERNAL_DB
# XXX watchout, $(top_builddir)/db3/libdb.la created by this Makefile may surprise
libdb_la = $(top_builddir)/db3/libdb.la
# XXX grrr, force noinst libdb.la for db3.
# there are more reliable ways to get the BDB version info, just a dirty
# hack for now...
BDBVER = $(shell grep ^LIBVERSION $(top_builddir)/db3/Makefile|cut -f2)
$(libdb_la): $(top_builddir)/db3/libdb-$(BDBVER).la
sed -e"/^libdir=/s/^.*$$/libdir=''/" \
< $(top_builddir)/db3/libdb-$(BDBVER).la > $(libdb_la)
CLEANFILES += $(libdb_la)
rpmlibexec_PROGRAMS =
rpmlibexec_PROGRAMS += rpmdb_archive
rpmdb_archive_SOURCES =
rpmdb_archive_LDADD = \
$(top_builddir)/db3/db_archive.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_checkpoint
rpmdb_checkpoint_SOURCES =
rpmdb_checkpoint_LDADD = \
$(top_builddir)/db3/db_checkpoint.o \
$(top_builddir)/db3/util_log.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_deadlock
rpmdb_deadlock_SOURCES =
rpmdb_deadlock_LDADD = \
$(top_builddir)/db3/db_deadlock.o \
$(top_builddir)/db3/util_log.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_dump
rpmdb_dump_SOURCES =
rpmdb_dump_LDADD = \
$(top_builddir)/db3/db_dump.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_load
rpmdb_load_SOURCES =
rpmdb_load_LDADD = \
$(top_builddir)/db3/db_load.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_printlog
rpmdb_printlog_SOURCES =
rpmdb_printlog_LDADD = \
$(top_builddir)/db3/db_printlog.o \
$(top_builddir)/db3/btree_autop.o \
$(top_builddir)/db3/crdel_autop.o \
$(top_builddir)/db3/db_autop.o \
$(top_builddir)/db3/dbreg_autop.o \
$(top_builddir)/db3/fileops_autop.o \
$(top_builddir)/db3/hash_autop.o \
$(top_builddir)/db3/qam_autop.o \
$(top_builddir)/db3/rep_autop.o \
$(top_builddir)/db3/txn_autop.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_recover
rpmdb_recover_SOURCES =
rpmdb_recover_LDADD = \
$(top_builddir)/db3/db_recover.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_stat
rpmdb_stat_SOURCES =
rpmdb_stat_LDADD = \
$(top_builddir)/db3/db_stat.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_svc
rpmdb_svc_SOURCES =
rpmdb_svc_LDADD = \
$(top_builddir)/db3/db_server_proc.o \
$(top_builddir)/db3/db_server_svc.o \
$(top_builddir)/db3/db_server_util.o \
$(top_builddir)/db3/gen_db_server.o \
$(top_builddir)/db3/util_log.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_upgrade
rpmdb_upgrade_SOURCES =
rpmdb_upgrade_LDADD = \
$(top_builddir)/db3/db_upgrade.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
rpmlibexec_PROGRAMS += rpmdb_verify
rpmdb_verify_SOURCES =
rpmdb_verify_LDADD = \
$(top_builddir)/db3/db_verify.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpm.la
endif
CLEANFILES += $(BUILT_SOURCES)

4
lib/backend/db3.c
View File

@ -1,5 +1,5 @@
/** \ingroup db3
* \file rpmdb/db3.c
* \file lib/db3.c
*/
static int _debug = 1; /* XXX if < 0 debugging, > 0 unusual error returns */
@ -15,7 +15,7 @@ static int _debug = 1; /* XXX if < 0 debugging, > 0 unusual error returns */
#include <rpm/rpmfileutil.h> /* rpmioMkPath */
#include <rpm/rpmlog.h>
#include "rpmdb/rpmdb_internal.h"
#include "lib/rpmdb_internal.h"
#include "debug.h"

6
lib/backend/dbconfig.c
View File

@ -1,5 +1,5 @@
/** \ingroup rpmdb
* \file rpmdb/dbconfig.c
* \file lib/dbconfig.c
*/
#include "system.h"
@ -11,7 +11,7 @@
#include <rpm/rpmstring.h>
#include <rpm/rpmlog.h>
#include <rpm/argv.h>
#include "rpmdb/rpmdb_internal.h"
#include "lib/rpmdb_internal.h"
#include "debug.h"
@ -402,7 +402,7 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag)
if (!(dbi->dbi_perms & 0600))
dbi->dbi_perms = 0644;
dbi->dbi_mode = rpmdb->db_mode;
/* FIX: figger rpmdb/dbi refcounts */
/* FIX: figger lib/dbi refcounts */
dbi->dbi_rpmdb = rpmdb;
dbi->dbi_rpmtag = rpmtag;

2
lib/backend/sqlite.c
View File

@ -35,7 +35,7 @@
#include <rpm/rpmstring.h>
#include <rpm/rpmdb.h>
#include "rpmdb/rpmdb_internal.h"
#include "lib/rpmdb_internal.h"
#include "debug.h"

2
lib/depends.c
View File

@ -14,7 +14,7 @@
#include <rpm/rpmds.h>
#include <rpm/rpmfi.h>
#include "rpmdb/rpmdb_internal.h" /* XXX response cache needs dbiOpen et al. */
#include "lib/rpmdb_internal.h" /* XXX response cache needs dbiOpen et al. */
#include "lib/rpmte_internal.h" /* XXX tsortInfo_s */
#include "lib/rpmts_internal.h"

6
lib/fprint.c
View File

@ -1,13 +1,13 @@
/**
* \file rpmdb/fprint.c
* \file lib/fprint.c
*/
#include "system.h"
#include <rpm/rpmfileutil.h> /* for rpmCleanPath */
#include "rpmdb/rpmdb_internal.h"
#include "rpmdb/fprint.h"
#include "lib/rpmdb_internal.h"
#include "lib/fprint.h"
#include "debug.h"
fingerPrintCache fpCacheCreate(int sizeHint)

4
lib/fprint.h
View File

@ -2,12 +2,12 @@
#define H_FINGERPRINT
/** \ingroup rpmtrans
* \file rpmdb/fprint.h
* \file lib/fprint.h
* Identify a file name path by a unique "finger print".
*/
#include <rpm/header.h>
#include "rpmdb/rpmhash.h"
#include "lib/rpmhash.h"
/**
*/

2
lib/hdrNVR.c
View File

@ -1,5 +1,5 @@
/** \ingroup rpmdb
* \file rpmdb/hdrNVR.c
* \file lib/hdrNVR.c
*/
#include "system.h"

4
lib/header.c
View File

@ -1,5 +1,5 @@
/** \ingroup header
* \file rpmdb/header.c
* \file lib/header.c
*/
/* RPM - Copyright (C) 1995-2002 Red Hat Software */
@ -13,7 +13,7 @@
#include <rpm/rpmtag.h>
#include <rpm/rpmstring.h>
#include <rpm/rpmpgp.h>
#include "rpmdb/header_internal.h"
#include "lib/header_internal.h"
#include "debug.h"

2
lib/header.h
View File

@ -2,7 +2,7 @@
#define H_HEADER
/** \ingroup header
* \file rpmdb/header.h
* \file lib/header.h
*
* An rpm header carries all information about a package. A header is
* a collection of data elements called tags. Each tag has a data type,

4
lib/header_internal.c
View File

@ -1,11 +1,11 @@
/** \ingroup header
* \file rpmdb/header_internal.c
* \file lib/header_internal.c
*/
#include "system.h"
#include <rpm/rpmtag.h>
#include "rpmdb/header_internal.h"
#include "lib/header_internal.h"
#include "debug.h"

2
lib/header_internal.h
View File

@ -2,7 +2,7 @@
#define H_HEADER_INTERNAL
/** \ingroup header
* \file rpmdb/header_internal.h
* \file lib/header_internal.h
*/
#include <netinet/in.h>

2
lib/merge.c
View File

@ -54,7 +54,7 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94";
*/
#include "system.h"
#include "rpmdb/rpmdb_internal.h" /* XXX for mergesort */
#include "lib/rpmdb_internal.h" /* XXX for mergesort */
#define ISIZE sizeof(int)
#define PSIZE sizeof(unsigned char *)

2
lib/package.c
View File

@ -16,7 +16,7 @@
#include "lib/signature.h"
#include "rpmio/digest.h"
#include "rpmio/rpmio_internal.h" /* fd*Digest(), fd stats */
#include "rpmdb/header_internal.h" /* XXX headerCheck */
#include "lib/header_internal.h" /* XXX headerCheck */
#include "debug.h"

2
lib/poptDB.c
View File

@ -1,5 +1,5 @@
/** \ingroup rpmcli
* \file rpmdb/poptDB.c
* \file lib/poptDB.c
* Popt tables for database modes.
*/

8
lib/rpmdb.c
View File

@ -1,5 +1,5 @@
/** \ingroup rpmdb dbi
* \file rpmdb/rpmdb.c
* \file lib/rpmdb.c
*/
#include "system.h"
@ -27,9 +27,9 @@
#include <rpm/rpmdb.h>
#include <rpm/argv.h>
#include "rpmdb/rpmdb_internal.h"
#include "rpmdb/fprint.h"
#include "rpmdb/header_internal.h" /* XXX for HEADERFLAG_ALLOCATED */
#include "lib/rpmdb_internal.h"
#include "lib/fprint.h"
#include "lib/header_internal.h" /* XXX for HEADERFLAG_ALLOCATED */
#include "debug.h"
int _rpmdb_debug = 0;

2
lib/rpmdb.h
View File

@ -2,7 +2,7 @@
#define H_RPMDB
/** \ingroup rpmdb dbi db1 db3
* \file rpmdb/rpmdb.h
* \file lib/rpmdb.h
* Access RPM indices using Berkeley DB interface(s).
*/

4
lib/rpmhash.c
View File

@ -1,10 +1,10 @@
/**
* \file rpmdb/rpmhash.c
* \file lib/rpmhash.c
* Hash table implemenation
*/
#include "system.h"
#include "rpmdb/rpmhash.h"
#include "lib/rpmhash.h"
#include "debug.h"
typedef const void * voidptr;

2
lib/rpmhash.h
View File

@ -2,7 +2,7 @@
#define H_RPMHASH
/**
* \file rpmdb/rpmhash.h
* \file lib/rpmhash.h
* Hash table implemenation.
*/

2
lib/rpmts_internal.h
View File

@ -4,7 +4,7 @@
#include <rpm/rpmts.h>
#include <rpm/rpmal.h> /* XXX availablePackage/relocateFileList ,*/
#include "rpmdb/rpmhash.h" /* XXX hashTable */
#include "lib/rpmhash.h" /* XXX hashTable */
/** \ingroup rpmts
*/

2
lib/signature.c
View File

@ -19,7 +19,7 @@
#include "lib/misc.h" /* XXX for dosetenv() */
#include "lib/rpmlead.h"
#include "lib/signature.h"
#include "rpmdb/header_internal.h"
#include "lib/header_internal.h"
#include "debug.h"

2
lib/tagname.c
View File

@ -1,5 +1,5 @@
/**
* \file rpmdb/tagname.c
* \file lib/tagname.c
*/
#include "system.h"

4
lib/transaction.c
View File

@ -13,8 +13,8 @@
#include <rpm/rpmstring.h>
#include <rpm/argv.h>
#include "rpmdb/rpmdb_internal.h" /* XXX for dbiIndexSetCount */
#include "rpmdb/fprint.h"
#include "lib/rpmdb_internal.h" /* XXX for dbiIndexSetCount */
#include "lib/fprint.h"
#include "lib/psm.h"
#include "lib/rpmlock.h"
#include "lib/rpmfi_internal.h" /* fi->replaced, fi->actions... */

24
po/POTFILES.in
View File

@ -54,19 +54,19 @@ lib/rpmvercmp.c
lib/signature.c
lib/transaction.c
lib/verify.c
lib/fprint.c
lib/hdrNVR.c
lib/header.c
lib/header_internal.c
lib/merge.c
lib/poptDB.c
lib/rpmdb.c
lib/rpmhash.c
lib/tagname.c
lib/backend/db3.c
lib/backend/dbconfig.c
lib/backend/sqlite.c
misc/error.c
rpmdb/db3.c
rpmdb/dbconfig.c
rpmdb/fprint.c
rpmdb/hdrNVR.c
rpmdb/header.c
rpmdb/header_internal.c
rpmdb/merge.c
rpmdb/poptDB.c
rpmdb/rpmdb.c
rpmdb/rpmhash.c
rpmdb/sqlite.c
rpmdb/tagname.c
rpmio/argv.c
rpmio/digest.c
rpmio/fts.c

12
preinstall.am
View File

@ -1,5 +1,5 @@
include/rpm/rpmints.h: rpmdb/rpmints.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/rpmdb/rpmints.h include/rpm/rpmints.h
include/rpm/rpmints.h: lib/rpmints.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/rpmints.h include/rpm/rpmints.h
BUILT_SOURCES += include/rpm/rpmints.h
CLEANFILES += include/rpm/rpmints.h
include/rpm/argv.h: rpmio/argv.h include/rpm/$(dirstamp)
@ -46,12 +46,12 @@ include/rpm/rpmutil.h: rpmio/rpmutil.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmutil.h include/rpm/rpmutil.h
BUILT_SOURCES += include/rpm/rpmutil.h
CLEANFILES += include/rpm/rpmutil.h
include/rpm/header.h: rpmdb/header.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/rpmdb/header.h include/rpm/header.h
include/rpm/header.h: lib/header.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/header.h include/rpm/header.h
BUILT_SOURCES += include/rpm/header.h
CLEANFILES += include/rpm/header.h
include/rpm/rpmdb.h: rpmdb/rpmdb.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/rpmdb/rpmdb.h include/rpm/rpmdb.h
include/rpm/rpmdb.h: lib/rpmdb.h include/rpm/$(dirstamp)
$(INSTALL_DATA) $(top_srcdir)/lib/rpmdb.h include/rpm/rpmdb.h
BUILT_SOURCES += include/rpm/rpmdb.h
CLEANFILES += include/rpm/rpmdb.h
include/rpm/rpmcallback.h: lib/rpmcallback.h include/rpm/$(dirstamp)

1
python/Makefile.am
View File

@ -18,7 +18,6 @@ _rpmmodule_la_LDFLAGS = -module -avoid-version
_rpmmodule_la_LIBADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
@WITH_NSS_LIB@ \
@WITH_POPT_LIB@ \

157
rpmdb/Makefile.am
View File

@ -1,157 +0,0 @@
# Makefile for rpm library.
include $(top_srcdir)/rpm.am
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
AM_CPPFLAGS += @WITH_SQLITE3_INCLUDE@
AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
check_PROGRAMS =
EXTRA_PROGRAMS =
CLEANFILES =
EXTRA_DIST = gentagtbl.sh
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmdb.la
librpmdb_la_SOURCES = \
dbconfig.c fprint.c fprint.h \
hdrNVR.c header.c header_internal.c header_internal.h \
merge.c \
poptDB.c rpmhash.c rpmhash.h rpmdb.c rpmdb_internal.h \
tagname.c tagtbl.c
librpmdb_la_SOURCES += db3.c
if SQLITE3
librpmdb_la_SOURCES += sqlite.c
endif
librpmdb_la_LDFLAGS = -release 4.6
librpmdb_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \
@WITH_POPT_LIB@ \
@WITH_SQLITE3_LIB@ \
@WITH_LIBELF_LIB@
if WITH_INTERNAL_DB
librpmdb_la_LIBADD += $(libdb_la)
else
librpmdb_la_LIBADD += @WITH_DB_LIB@
endif
tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmtag.h gentagtbl.sh
@AWK=${AWK} ${SHELL} gentagtbl.sh $(top_srcdir)/lib/rpmtag.h > $@
BUILT_SOURCES = tagtbl.c
if WITH_INTERNAL_DB
# XXX watchout, $(top_builddir)/db3/libdb.la created by this Makefile may surprise
libdb_la = $(top_builddir)/db3/libdb.la
# XXX grrr, force noinst libdb.la for db3.
# there are more reliable ways to get the BDB version info, just a dirty
# hack for now...
BDBVER = $(shell grep ^LIBVERSION $(top_builddir)/db3/Makefile|cut -f2)
$(libdb_la): $(top_builddir)/db3/libdb-$(BDBVER).la
sed -e"/^libdir=/s/^.*$$/libdir=''/" \
< $(top_builddir)/db3/libdb-$(BDBVER).la > $(libdb_la)
CLEANFILES += $(libdb_la)
rpmlibexec_PROGRAMS =
rpmlibexec_PROGRAMS += rpmdb_archive
rpmdb_archive_SOURCES =
rpmdb_archive_LDADD = \
$(top_builddir)/db3/db_archive.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_checkpoint
rpmdb_checkpoint_SOURCES =
rpmdb_checkpoint_LDADD = \
$(top_builddir)/db3/db_checkpoint.o \
$(top_builddir)/db3/util_log.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_deadlock
rpmdb_deadlock_SOURCES =
rpmdb_deadlock_LDADD = \
$(top_builddir)/db3/db_deadlock.o \
$(top_builddir)/db3/util_log.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_dump
rpmdb_dump_SOURCES =
rpmdb_dump_LDADD = \
$(top_builddir)/db3/db_dump.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_load
rpmdb_load_SOURCES =
rpmdb_load_LDADD = \
$(top_builddir)/db3/db_load.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_printlog
rpmdb_printlog_SOURCES =
rpmdb_printlog_LDADD = \
$(top_builddir)/db3/db_printlog.o \
$(top_builddir)/db3/btree_autop.o \
$(top_builddir)/db3/crdel_autop.o \
$(top_builddir)/db3/db_autop.o \
$(top_builddir)/db3/dbreg_autop.o \
$(top_builddir)/db3/fileops_autop.o \
$(top_builddir)/db3/hash_autop.o \
$(top_builddir)/db3/qam_autop.o \
$(top_builddir)/db3/rep_autop.o \
$(top_builddir)/db3/txn_autop.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_recover
rpmdb_recover_SOURCES =
rpmdb_recover_LDADD = \
$(top_builddir)/db3/db_recover.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_stat
rpmdb_stat_SOURCES =
rpmdb_stat_LDADD = \
$(top_builddir)/db3/db_stat.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_svc
rpmdb_svc_SOURCES =
rpmdb_svc_LDADD = \
$(top_builddir)/db3/db_server_proc.o \
$(top_builddir)/db3/db_server_svc.o \
$(top_builddir)/db3/db_server_util.o \
$(top_builddir)/db3/gen_db_server.o \
$(top_builddir)/db3/util_log.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_upgrade
rpmdb_upgrade_SOURCES =
rpmdb_upgrade_LDADD = \
$(top_builddir)/db3/db_upgrade.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
rpmlibexec_PROGRAMS += rpmdb_verify
rpmdb_verify_SOURCES =
rpmdb_verify_LDADD = \
$(top_builddir)/db3/db_verify.o \
$(top_builddir)/db3/util_cache.o \
$(top_builddir)/db3/util_sig.o \
librpmdb.la
endif
CLEANFILES += $(BUILT_SOURCES)

2
tools/dump.c
View File

@ -1,7 +1,7 @@
#include "system.h"
const char *__progname;
#include "rpmdb/header_internal.h"
#include "lib/header_internal.h"
#include "debug.h"
int main(int argc, char *argv[])

2
tools/dumpdb.c
View File

@ -1,7 +1,7 @@
#include "system.h"
const char *__progname;
#include "rpmdb/header_internal.h"
#include "lib/header_internal.h"
#include <rpm/rpmtag.h>
#include <rpm/rpmlib.h> /* rpmReadConfigFiles */