diff options
166 files changed, 474 insertions, 474 deletions
diff --git a/Makefile.am b/Makefile.am index dd0fe1953..441bec907 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ DIST_SUBDIRS = po misc db3 lua rpmio rpmdb lib build python scripts doc tests pkgconfigdir = $(libdir)/pkgconfig -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +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 @@ -4,16 +4,16 @@ #include "system.h" -#include <rpmcli.h> -#include <rpmbuild.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmbuild.h> -#include <rpmps.h> -#include <rpmte.h> -#include <rpmts.h> -#include <rpmfileutil.h> +#include <rpm/rpmps.h> +#include <rpm/rpmte.h> +#include <rpm/rpmts.h> +#include <rpm/rpmfileutil.h> #include "build.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" /** diff --git a/build/Makefile.am b/build/Makefile.am index 35d8834cb..ff6195a86 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,6 +1,6 @@ # Makefile for rpmbuild library. -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@ diff --git a/build/build.c b/build/build.c index 7f8d18ef9..177cbd223 100644 --- a/build/build.c +++ b/build/build.c @@ -5,9 +5,9 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "debug.h" diff --git a/build/buildio.h b/build/buildio.h index 28252bb6d..4750035cd 100644 --- a/build/buildio.h +++ b/build/buildio.h @@ -8,7 +8,7 @@ * @todo Eliminate, merge into rpmlib. */ -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> #ifdef __cplusplus extern "C" { diff --git a/build/expression.c b/build/expression.c index a3c799ee8..18a42351b 100644 --- a/build/expression.c +++ b/build/expression.c @@ -13,9 +13,9 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlib.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/build/files.c b/build/files.c index 429fcefe4..dca32e69f 100644 --- a/build/files.c +++ b/build/files.c @@ -10,25 +10,25 @@ #include <regex.h> -#include <rpmpgp.h> +#include <rpm/rpmpgp.h> #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "rpmio/fts.h" -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> #include "lib/cpio.h" -#include <argv.h> -#include <rpmfc.h> +#include <rpm/argv.h> +#include <rpm/rpmfc.h> #include "lib/rpmfi_internal.h" /* XXX pretty much all rpmfi internals... */ #include "lib/rpmte_internal.h" /* XXX rpmte init */ #include "build/buildio.h" -#include <rpmfileutil.h> /* rpmDoDigest() */ +#include <rpm/rpmfileutil.h> /* rpmDoDigest() */ #include "lib/legacy.h" /* XXX expandFileList, compressFileList */ -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" #define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; } diff --git a/build/misc.c b/build/misc.c index c084dcf40..20973662b 100644 --- a/build/misc.c +++ b/build/misc.c @@ -3,7 +3,7 @@ */ #include "system.h" -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> #include "debug.h" int parseNum(const char * line, int * res) diff --git a/build/names.c b/build/names.c index 2eb8f2596..14fdad41f 100644 --- a/build/names.c +++ b/build/names.c @@ -6,8 +6,8 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> #include "debug.h" typedef const char * ugstr_t; diff --git a/build/pack.c b/build/pack.c index 4d121ec90..5a616baba 100644 --- a/build/pack.c +++ b/build/pack.c @@ -6,21 +6,21 @@ #include "system.h" #include "rpmio/rpmio_internal.h" /* fdInitDigest, fdFiniDigest */ -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> #include "lib/cpio.h" #include "lib/fsm.h" #include "lib/rpmfi_internal.h" /* XXX fi->fsm */ -#include <rpmts.h> +#include <rpm/rpmts.h> #include "build/buildio.h" #include "lib/legacy.h" /* XXX providePackageNVR */ #include "lib/signature.h" #include "lib/rpmlead.h" -#include <rpmfileutil.h> -#include <rpmlog.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmlog.h> #include "debug.h" /** diff --git a/build/parseBuildInstallClean.c b/build/parseBuildInstallClean.c index f16127be6..e29b38e3f 100644 --- a/build/parseBuildInstallClean.c +++ b/build/parseBuildInstallClean.c @@ -4,8 +4,8 @@ */ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/build/parseChangelog.c b/build/parseChangelog.c index a39a74f49..e62745370 100644 --- a/build/parseChangelog.c +++ b/build/parseChangelog.c @@ -5,8 +5,8 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> #include "debug.h" #define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; } diff --git a/build/parseDescription.c b/build/parseDescription.c index b1190287f..25423aade 100644 --- a/build/parseDescription.c +++ b/build/parseDescription.c @@ -5,8 +5,8 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> #include "debug.h" extern int noLang; diff --git a/build/parseFiles.c b/build/parseFiles.c index 2b3e1a3ea..e685b4413 100644 --- a/build/parseFiles.c +++ b/build/parseFiles.c @@ -5,9 +5,9 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "debug.h" /* These have to be global scope to make up for *stupid* compilers */ diff --git a/build/parsePreamble.c b/build/parsePreamble.c index b8982d223..bce36b032 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -5,9 +5,9 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "debug.h" #define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; } diff --git a/build/parsePrep.c b/build/parsePrep.c index 35cd95471..f20f8666f 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -5,9 +5,9 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "debug.h" /* These have to be global to make up for stupid compilers */ diff --git a/build/parseReqs.c b/build/parseReqs.c index 4e0dc6cfb..a4bc213b8 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.c @@ -5,8 +5,8 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> #include "debug.h" /** diff --git a/build/parseScript.c b/build/parseScript.c index 9c613e333..54d85f559 100644 --- a/build/parseScript.c +++ b/build/parseScript.c @@ -5,8 +5,8 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> #include "debug.h" #include "rpmio/rpmlua.h" diff --git a/build/parseSpec.c b/build/parseSpec.c index 4d4be4400..d4edab859 100644 --- a/build/parseSpec.c +++ b/build/parseSpec.c @@ -5,11 +5,11 @@ #include "system.h" -#include <rpmbuild.h> -#include <rpmds.h> -#include <rpmts.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmds.h> +#include <rpm/rpmts.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "debug.h" #define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; } diff --git a/build/poptBT.c b/build/poptBT.c index 99ff7c871..7ce5a9c4f 100644 --- a/build/poptBT.c +++ b/build/poptBT.c @@ -5,9 +5,9 @@ #include "system.h" -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" struct rpmBuildArguments_s rpmBTArgs; diff --git a/build/reqprov.c b/build/reqprov.c index f0ffe27a9..1b02aeefb 100644 --- a/build/reqprov.c +++ b/build/reqprov.c @@ -5,7 +5,7 @@ #include "system.h" -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> #include "debug.h" int addReqProv(rpmSpec spec, Header h, rpmTag tagN, diff --git a/build/rpmbuild.h b/build/rpmbuild.h index 6b8e222e2..2754a3769 100644 --- a/build/rpmbuild.h +++ b/build/rpmbuild.h @@ -6,14 +6,14 @@ * This is the *only* module users of librpmbuild should need to include. */ -#include <rpmcli.h> -#include <rpmds.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmds.h> /* and it shouldn't need these :-( */ -#include <rpmstring.h> +#include <rpm/rpmstring.h> /* but this will be needed */ -#include <rpmspec.h> +#include <rpm/rpmspec.h> #ifdef __cplusplus extern "C" { diff --git a/build/rpmfc.c b/build/rpmfc.c index 73137749a..5eb1b2110 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -2,13 +2,13 @@ #include <signal.h> /* getOutputFrom() */ -#include <rpmbuild.h> -#include <argv.h> -#include <rpmfc.h> -#include <rpmlog.h> +#include <rpm/rpmbuild.h> +#include <rpm/argv.h> +#include <rpm/rpmfc.h> +#include <rpm/rpmlog.h> -#include <rpmds.h> -#include <rpmfi.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfi.h> #if HAVE_GELF_H #include <gelf.h> diff --git a/build/rpmfc.h b/build/rpmfc.h index 87034941d..7d6dd9f09 100644 --- a/build/rpmfc.h +++ b/build/rpmfc.h @@ -8,10 +8,10 @@ #include <magic.h> -#include <rpmlib.h> /* for rpmds, rpmSpec */ -#include <argv.h> /* for ARGV_t */ -#include <rpmstring.h> /* for StringBuf */ -#include <rpmspec.h> /* for Package */ +#include <rpm/rpmlib.h> /* for rpmds, rpmSpec */ +#include <rpm/argv.h> /* for ARGV_t */ +#include <rpm/rpmstring.h> /* for StringBuf */ +#include <rpm/rpmspec.h> /* for Package */ #ifdef __cplusplus extern "C" { diff --git a/build/rpmspec.h b/build/rpmspec.h index 4409ea36d..dc511485d 100644 --- a/build/rpmspec.h +++ b/build/rpmspec.h @@ -6,8 +6,8 @@ * The rpmSpec and Package data structures used during build. */ -#include <rpmstring.h> /* StringBuf */ -#include <rpmcli.h> /* for QVA_t */ +#include <rpm/rpmstring.h> /* StringBuf */ +#include <rpm/rpmcli.h> /* for QVA_t */ #ifdef __cplusplus extern "C" { diff --git a/build/spec.c b/build/spec.c index d9e4bea35..ddffb48f6 100644 --- a/build/spec.c +++ b/build/spec.c @@ -6,11 +6,11 @@ #include "system.h" #include "build/buildio.h" -#include <rpmds.h> -#include <rpmfi.h> -#include <rpmts.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfi.h> +#include <rpm/rpmts.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "debug.h" diff --git a/lib/Makefile.am b/lib/Makefile.am index 58372163d..99f931334 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ # Makefile for rpm library. -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@ AM_CPPFLAGS += -I$(top_srcdir)/misc diff --git a/lib/cpio.c b/lib/cpio.c index f9be7a21f..40b90e26e 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -9,12 +9,12 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "lib/cpio.h" #include "lib/fsm.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/lib/depends.c b/lib/depends.c index 0d5d27d98..9f0d8cf12 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -4,16 +4,16 @@ #include "system.h" -#include <rpmcli.h> /* XXX rpmcliPackagesTotal */ +#include <rpm/rpmcli.h> /* XXX rpmcliPackagesTotal */ -#include <rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */ -#include <rpmlog.h> +#include <rpm/rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */ +#include <rpm/rpmlog.h> -#include <rpmdb.h> +#include <rpm/rpmdb.h> #include "rpmdb/rpmdb_internal.h" /* XXX response cache needs dbiOpen et al. */ -#include <rpmds.h> -#include <rpmfi.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfi.h> #include "lib/rpmte_internal.h" /* XXX tsortInfo_s */ #include "lib/rpmts_internal.h" diff --git a/lib/formats.c b/lib/formats.c index 6697bdb45..393a78247 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -4,11 +4,11 @@ #include "system.h" #include "rpmio/digest.h" -#include <rpmlib.h> -#include <rpmds.h> -#include <rpmmacro.h> /* XXX for %_i18ndomains */ +#include <rpm/rpmlib.h> +#include <rpm/rpmds.h> +#include <rpm/rpmmacro.h> /* XXX for %_i18ndomains */ -#include <rpmfi.h> +#include <rpm/rpmfi.h> #include "lib/manifest.h" @@ -3,9 +3,9 @@ */ #include "system.h" -#include <rpmlib.h> -#include <rpmfileutil.h> /* for rpmGetPath */ -#include <rpmlog.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmfileutil.h> /* for rpmGetPath */ +#include <rpm/rpmlog.h> #include "debug.h" @@ -6,19 +6,19 @@ #include "system.h" #include "rpmio/rpmio_internal.h" /* fdGet/SetCpioPos, fdInit/FiniDigest */ -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "lib/cpio.h" #include "lib/fsm.h" #define fsmUNSAFE fsmStage -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "lib/rpmfi_internal.h" /* XXX fi->apath, fi->action... */ -#include <rpmte.h> -#include <rpmts.h> -#include <rpmsq.h> +#include <rpm/rpmte.h> +#include <rpm/rpmts.h> +#include <rpm/rpmsq.h> #include "rpmio/ugid.h" /* XXX unameToUid() and gnameToGid() */ @@ -7,7 +7,7 @@ */ #include "lib/cpio.h" -#include <rpmfi.h> +#include <rpm/rpmfi.h> extern int _fsm_debug; diff --git a/lib/idtx.c b/lib/idtx.c index 4f25f582d..4553f72df 100644 --- a/lib/idtx.c +++ b/lib/idtx.c @@ -1,11 +1,11 @@ #include "system.h" -#include <idtx.h> -#include <rpmlib.h> -#include <rpmdb.h> -#include <rpmts.h> -#include <rpmfileutil.h> -#include <rpmlog.h> +#include <rpm/idtx.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmts.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmlog.h> static int reverse = -1; diff --git a/lib/idtx.h b/lib/idtx.h index 325927acf..956be7183 100644 --- a/lib/idtx.h +++ b/lib/idtx.h @@ -1,7 +1,7 @@ #ifndef H_RPMIDTX #define H_RPMIDTX -#include <rpmlib.h> +#include <rpm/rpmlib.h> #ifdef __cplusplus extern "C" { diff --git a/lib/legacy.c b/lib/legacy.c index f35bee8f5..ba0d03402 100644 --- a/lib/legacy.c +++ b/lib/legacy.c @@ -4,11 +4,11 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmstring.h> -#include <rpmfi.h> -#include <rpmds.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmstring.h> +#include <rpm/rpmfi.h> +#include <rpm/rpmds.h> #include "lib/legacy.h" #include "debug.h" diff --git a/lib/manifest.c b/lib/manifest.c index cce22af2b..6fcfaeb0f 100644 --- a/lib/manifest.c +++ b/lib/manifest.c @@ -4,11 +4,11 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "lib/manifest.h" #include "debug.h" diff --git a/lib/misc.c b/lib/misc.c index ed56443be..9a01bd5fc 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -7,10 +7,10 @@ /* just to put a marker in librpm.a */ const char * RPMVERSION = VERSION; -#include <rpmurl.h> -#include <rpmmacro.h> /* XXX for rpmGetPath */ -#include <rpmlib.h> -#include <rpmlog.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmmacro.h> /* XXX for rpmGetPath */ +#include <rpm/rpmlib.h> +#include <rpm/rpmlog.h> #include "lib/misc.h" #include "debug.h" diff --git a/lib/package.c b/lib/package.c index dcd50a372..f345b3b38 100644 --- a/lib/package.c +++ b/lib/package.c @@ -8,14 +8,14 @@ #include "rpmio/digest.h" #include "rpmio/rpmio_internal.h" /* fd*Digest(), fd stats */ -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmts.h> +#include <rpm/rpmts.h> #include "lib/legacy.h" /* XXX legacyRetrofit() */ #include "lib/rpmlead.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "rpmdb/header_internal.h" /* XXX headerCheck */ #include "lib/signature.h" #include "debug.h" diff --git a/lib/poptALL.c b/lib/poptALL.c index b1d7f6eca..15023c8ac 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -6,9 +6,9 @@ #include "system.h" const char *__progname; -#include <rpmcli.h> -#include <rpmgi.h> -#include <rpmlog.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmgi.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/lib/poptI.c b/lib/poptI.c index 0a8d16ce5..70edae969 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -5,7 +5,7 @@ #include "system.h" -#include <rpmcli.h> +#include <rpm/rpmcli.h> #include "debug.h" diff --git a/lib/poptQV.c b/lib/poptQV.c index 79d80b945..7d9862f28 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.c @@ -5,8 +5,8 @@ #include "system.h" -#include <rpmcli.h> -#include <rpmgi.h> /* XXX for giFlags */ +#include <rpm/rpmcli.h> +#include <rpm/rpmgi.h> /* XXX for giFlags */ #include "debug.h" @@ -5,30 +5,30 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmurl.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmurl.h> #include "rpmio/rpmlua.h" #include "lib/cpio.h" #include "lib/fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */ #include "lib/psm.h" -#include <rpmds.h> +#include <rpm/rpmds.h> #include "lib/rpmfi_internal.h" /* XXX replaced/states, fi->hge, fi->te... */ #include "lib/rpmte_internal.h" /* XXX te->fd */ #include "lib/rpmtsscore.h" -#include <rpmts.h> +#include <rpm/rpmts.h> #include "lib/rpmlead.h" /* writeLead proto */ #include "lib/signature.h" /* signature constants */ -#include <rpmfileutil.h> /* rpmMkTempFile() */ +#include <rpm/rpmfileutil.h> /* rpmMkTempFile() */ #include "lib/misc.h" /* XXX rpmMkdirPath, doputenv */ -#include <rpmdb.h> /* XXX for db_chrootDone */ -#include <rpmlog.h> +#include <rpm/rpmdb.h> /* XXX for db_chrootDone */ +#include <rpm/rpmlog.h> #include "debug.h" #define _PSM_DEBUG 0 @@ -7,8 +7,8 @@ */ #define _RPMSQ_INTERNAL -#include <rpmsq.h> -#include <rpmcallback.h> +#include <rpm/rpmsq.h> +#include <rpm/rpmcallback.h> extern int _psm_debug; diff --git a/lib/query.c b/lib/query.c index 23e6130e5..eaf5d9599 100644 --- a/lib/query.c +++ b/lib/query.c @@ -9,17 +9,17 @@ # define PATH_MAX 255 #endif -#include <rpmcli.h> +#include <rpm/rpmcli.h> -#include <rpmdb.h> -#include <rpmfi.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmfi.h> -#include <rpmgi.h> -#include <rpmts.h> +#include <rpm/rpmgi.h> +#include <rpm/rpmts.h> #include "lib/manifest.h" -#include <rpmlog.h> -#include <rpmfileutil.h> /* rpmCleanPath */ +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> /* rpmCleanPath */ #include "debug.h" #include "lib/misc.h" /* XXX for currentDirectory */ diff --git a/lib/rpmal.c b/lib/rpmal.c index 403707a4a..a6c9d76a6 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -4,11 +4,11 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmal.h> -#include <rpmds.h> -#include <rpmfi.h> +#include <rpm/rpmal.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfi.h> #include "debug.h" diff --git a/lib/rpmal.h b/lib/rpmal.h index 084e9e625..639b8d395 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -6,8 +6,8 @@ * Structures used for managing added/available package lists. */ -#include <rpmlib.h> /* for rpmds, rpmfi, uint32_t */ -#include <rpmcallback.h> /* for fnpyKey */ +#include <rpm/rpmlib.h> /* for rpmds, rpmfi, uint32_t */ +#include <rpm/rpmcallback.h> /* for fnpyKey */ #ifdef __cplusplus extern "C" { diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 38aeee41c..f4fd56c5c 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -5,18 +5,18 @@ #include "system.h" -#include <rpmpgp.h> +#include <rpm/rpmpgp.h> #include "rpmio/rpmio_internal.h" /* for fd*Digest() */ -#include <rpmcli.h> +#include <rpm/rpmcli.h> -#include <rpmdb.h> +#include <rpm/rpmdb.h> -#include <rpmts.h> +#include <rpm/rpmts.h> -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "lib/rpmlead.h" #include "lib/signature.h" -#include <rpmfileutil.h> /* rpmMkTempFile() */ +#include <rpm/rpmfileutil.h> /* rpmMkTempFile() */ #include "debug.h" int _print_pkts = 0; diff --git a/lib/rpmcli.h b/lib/rpmcli.h index e79a7c52c..15a10d308 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -5,13 +5,13 @@ * \file lib/rpmcli.h */ -#include <rpmlib.h> -#include <rpmurl.h> -#include <rpmmacro.h> -#include <rpmcallback.h> -#include <rpmts.h> -#include <rpmfi.h> -#include <argv.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmcallback.h> +#include <rpm/rpmts.h> +#include <rpm/rpmfi.h> +#include <rpm/argv.h> #ifdef __cplusplus extern "C" { diff --git a/lib/rpmds.c b/lib/rpmds.c index a0bae296c..fc1a69b69 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -3,11 +3,11 @@ */ #include "system.h" -#include <rpmlib.h> -#include <rpmstring.h> -#include <rpmlog.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmstring.h> +#include <rpm/rpmlog.h> -#include <rpmds.h> +#include <rpm/rpmds.h> #include "debug.h" diff --git a/lib/rpmds.h b/lib/rpmds.h index c5bac3c1f..81ac79c70 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -6,8 +6,8 @@ * Structure(s) used for dependency tag sets. */ -#include <rpmlib.h> /* for rpmds */ -#include <rpmps.h> +#include <rpm/rpmlib.h> /* for rpmds */ +#include <rpm/rpmps.h> #ifdef __cplusplus extern "C" { diff --git a/lib/rpmfi.c b/lib/rpmfi.c index b4462d13e..dd3e86207 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -5,22 +5,22 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmlog.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmlog.h> #include "lib/cpio.h" /* XXX CPIO_FOO */ #include "lib/fsm.h" /* XXX newFSM() */ -#include <rpmds.h> +#include <rpm/rpmds.h> #include "lib/rpmfi_internal.h" #include "lib/rpmte_internal.h" /* relocations */ -#include <rpmts.h> +#include <rpm/rpmts.h> -#include <rpmfileutil.h>/* XXX domd5 */ -#include <rpmstring.h> -#include <rpmmacro.h> /* XXX rpmCleanPath */ +#include <rpm/rpmfileutil.h>/* XXX domd5 */ +#include <rpm/rpmstring.h> +#include <rpm/rpmmacro.h> /* XXX rpmCleanPath */ #include "debug.h" diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 95e54ffed..021a0b898 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -6,7 +6,7 @@ * Structure(s) used for file info tag sets. */ -#include <rpmlib.h> /* for rpmfi */ +#include <rpm/rpmlib.h> /* for rpmfi */ #ifdef __cplusplus extern "C" { diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h index 5beab2f2a..551d298ec 100644 --- a/lib/rpmfi_internal.h +++ b/lib/rpmfi_internal.h @@ -1,7 +1,7 @@ #ifndef _RPMFI_INTERNAL_H #define _RPMFI_INTERNAL_H -#include <rpmfi.h> +#include <rpm/rpmfi.h> /** */ diff --git a/lib/rpmgi.c b/lib/rpmgi.c index a52020e54..0cc5fd7eb 100644 --- a/lib/rpmgi.c +++ b/lib/rpmgi.c @@ -3,17 +3,17 @@ */ #include "system.h" -#include <rpmlib.h> -#include <rpmte.h> /* XXX rpmElementType */ +#include <rpm/rpmlib.h> +#include <rpm/rpmte.h> /* XXX rpmElementType */ -#include <rpmgi.h> +#include <rpm/rpmgi.h> #include "rpmio/fts.h" -#include <rpmdb.h> -#include <rpmmacro.h> /* XXX rpmExpand */ -#include <rpmfileutil.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmmacro.h> /* XXX rpmExpand */ +#include <rpm/rpmfileutil.h> #include "lib/manifest.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/lib/rpmgi.h b/lib/rpmgi.h index 0153fda52..42cadf7c7 100644 --- a/lib/rpmgi.h +++ b/lib/rpmgi.h @@ -5,10 +5,10 @@ * \file lib/rpmgi.h */ -#include <rpmlib.h> -#include <rpmte.h> -#include <rpmts.h> -#include <argv.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmte.h> +#include <rpm/rpmts.h> +#include <rpm/argv.h> #ifdef __cplusplus extern "C" { diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 586849d23..ade1bae3d 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -4,14 +4,14 @@ #include "system.h" -#include <rpmcli.h> - -#include <rpmdb.h> -#include <rpmds.h> -#include <rpmts.h> -#include <rpmlog.h> -#include <rpmfileutil.h> -#include <idtx.h> +#include <rpm/rpmcli.h> + +#include <rpm/rpmdb.h> +#include <rpm/rpmds.h> +#include <rpm/rpmts.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> +#include <rpm/idtx.h> #include "lib/manifest.h" #include "debug.h" diff --git a/lib/rpmlead.c b/lib/rpmlead.c index f4cffd5e0..33c421a32 100644 --- a/lib/rpmlead.c +++ b/lib/rpmlead.c @@ -6,12 +6,12 @@ #include <netinet/in.h> -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "lib/signature.h" #include "lib/rpmlead.h" #include "lib/legacy.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" static unsigned char lead_magic[] = { diff --git a/lib/rpmlead.h b/lib/rpmlead.h index 7593cf0f9..be91a5291 100644 --- a/lib/rpmlead.h +++ b/lib/rpmlead.h @@ -21,7 +21,7 @@ extern "C" { typedef struct rpmlead_s * rpmlead; -#include <rpmlib.h> +#include <rpm/rpmlib.h> /** \ingroup lead * Initialize a lead structure diff --git a/lib/rpmlib.h b/lib/rpmlib.h index a93b448bd..4ac5dcbe9 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -8,9 +8,9 @@ * */ -#include <rpmio.h> -#include <header.h> -#include <rpmtag.h> +#include <rpm/rpmio.h> +#include <rpm/header.h> +#include <rpm/rpmtag.h> #include <popt.h> #ifdef __cplusplus diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c index 06483475c..67424c931 100644 --- a/lib/rpmlibprov.c +++ b/lib/rpmlibprov.c @@ -4,9 +4,9 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmds.h> +#include <rpm/rpmds.h> #include "debug.h" diff --git a/lib/rpmlock.c b/lib/rpmlock.c index 87c102f6e..83664d62d 100644 --- a/lib/rpmlock.c +++ b/lib/rpmlock.c @@ -1,12 +1,12 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmlog.h> -#include <rpmmacro.h> -#include <rpmfileutil.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmfileutil.h> -#include <rpmts.h> +#include <rpm/rpmts.h> #include "lib/rpmlock.h" #include "debug.h" diff --git a/lib/rpmps.c b/lib/rpmps.c index 8f59ef0a4..00cb779ef 100644 --- a/lib/rpmps.c +++ b/lib/rpmps.c @@ -4,9 +4,9 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmps.h> +#include <rpm/rpmps.h> #include "debug.h" diff --git a/lib/rpmps.h b/lib/rpmps.h index e2cb3018e..699abd9c5 100644 --- a/lib/rpmps.h +++ b/lib/rpmps.h @@ -6,7 +6,7 @@ * Structures and prototypes used for an "rpmps" problem set. */ -#include <rpmcallback.h> /* for fnpyKey */ +#include <rpm/rpmcallback.h> /* for fnpyKey */ #ifdef __cplusplus extern "C" { diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 26dd0c3ed..2347f42a5 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -14,13 +14,13 @@ #endif #include "rpmio/rpmio_internal.h" /* XXX for rpmioSlurp */ -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmfileutil.h> -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmstring.h> #include "rpmio/rpmlua.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" static const char *defrcfiles = diff --git a/lib/rpmte.c b/lib/rpmte.c index c9dd66ea2..bbbe6dd1f 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -3,13 +3,13 @@ * Routine(s) to handle an "rpmte" transaction element. */ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmds.h> -#include <rpmfi.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfi.h> #include "lib/rpmte_internal.h" -#include <rpmts.h> +#include <rpm/rpmts.h> #include "debug.h" diff --git a/lib/rpmte.h b/lib/rpmte.h index 11406ddb5..fd0724bd5 100644 --- a/lib/rpmte.h +++ b/lib/rpmte.h @@ -6,7 +6,7 @@ * Structures used for an "rpmte" transaction element. */ -#include <rpmal.h> +#include <rpm/rpmal.h> #ifdef __cplusplus extern "C" { diff --git a/lib/rpmte_internal.h b/lib/rpmte_internal.h index 4d5c9e690..7051bdcbb 100644 --- a/lib/rpmte_internal.h +++ b/lib/rpmte_internal.h @@ -1,7 +1,7 @@ #ifndef _RPMTE_INTERNAL_H #define _RPMTE_INTERNAL_H -#include <rpmte.h> +#include <rpm/rpmte.h> /** \ingroup rpmte * Dependncy ordering information. diff --git a/lib/rpmts.c b/lib/rpmts.c index db1c821e1..ccb2b15a5 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -4,22 +4,22 @@ */ #include "system.h" -#include <rpmurl.h> +#include <rpm/rpmurl.h> #include "rpmio/digest.h" -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmfileutil.h> /* rpmtsOpenDB() needs rpmGetPath */ -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmfileutil.h> /* rpmtsOpenDB() needs rpmGetPath */ +#include <rpm/rpmstring.h> -#include <rpmdb.h> +#include <rpm/rpmdb.h> -#include <rpmal.h> -#include <rpmds.h> -#include <rpmfi.h> +#include <rpm/rpmal.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfi.h> #include "lib/rpmlock.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> -#include <rpmte.h> +#include <rpm/rpmte.h> #include "lib/rpmts_internal.h" diff --git a/lib/rpmts.h b/lib/rpmts.h index 85ee6bcc8..517d674e0 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -6,12 +6,12 @@ * Structures and prototypes used for an "rpmts" transaction set. */ -#include <rpmlib.h> /* for rpmts */ -#include <rpmps.h> -#include <rpmsw.h> -#include <rpmpgp.h> -#include <rpmfi.h> -#include <rpmcallback.h> +#include <rpm/rpmlib.h> /* for rpmts */ +#include <rpm/rpmps.h> +#include <rpm/rpmsw.h> +#include <rpm/rpmpgp.h> +#include <rpm/rpmfi.h> +#include <rpm/rpmcallback.h> #ifdef __cplusplus extern "C" { diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h index de4fc1314..3a41bf8fc 100644 --- a/lib/rpmts_internal.h +++ b/lib/rpmts_internal.h @@ -1,9 +1,9 @@ #ifndef _RPMTS_INTERNAL_H #define _RPMTS_INTERNAL_H -#include <rpmts.h> +#include <rpm/rpmts.h> #include "rpmdb/rpmhash.h" /* XXX hashTable */ -#include <rpmal.h> /* XXX availablePackage/relocateFileList ,*/ +#include <rpm/rpmal.h> /* XXX availablePackage/relocateFileList ,*/ #include "lib/rpmtsscore.h" /* for rpmtsScore */ extern int _cacheDependsRC; diff --git a/lib/rpmtsscore.h b/lib/rpmtsscore.h index 871fa7766..6f88a0f05 100644 --- a/lib/rpmtsscore.h +++ b/lib/rpmtsscore.h @@ -1,8 +1,8 @@ #ifndef H_RPMTSSCORE #define H_RPMTSSCORE -#include <rpmlib.h> -#include <rpmte.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmte.h> /********************** * Transaction Scores * diff --git a/lib/rpmvercmp.c b/lib/rpmvercmp.c index b847113f8..86c9e69f3 100644 --- a/lib/rpmvercmp.c +++ b/lib/rpmvercmp.c @@ -4,8 +4,8 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmstring.h> #include "debug.h" diff --git a/lib/signature.c b/lib/signature.c index d01546c62..f28f03454 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -5,16 +5,16 @@ #include "system.h" #include "rpmio/digest.h" -#include <rpmlib.h> -#include <rpmmacro.h> /* XXX for rpmGetPath() */ -#include <rpmdb.h> -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> /* XXX for rpmGetPath() */ +#include <rpm/rpmdb.h> +#include <rpm/rpmstring.h> -#include <rpmts.h> +#include <rpm/rpmts.h> -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "lib/misc.h" /* XXX for dosetenv() */ -#include <rpmfileutil.h> +#include <rpm/rpmfileutil.h> #include "lib/rpmlead.h" #include "lib/signature.h" #include "rpmdb/header_internal.h" diff --git a/lib/signature.h b/lib/signature.h index ce2fed7f6..213156e27 100644 --- a/lib/signature.h +++ b/lib/signature.h @@ -6,7 +6,7 @@ * Generate and verify signatures. */ -#include <header.h> +#include <rpm/header.h> /** \ingroup signature * Signature types stored in rpm lead. diff --git a/lib/tcpu.c b/lib/tcpu.c index 408c403cc..41dae7415 100644 --- a/lib/tcpu.c +++ b/lib/tcpu.c @@ -1,6 +1,6 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmmacro.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> #include "debug.h" #define _PROC_CPUINFO "/proc/cpuinfo" @@ -1,8 +1,8 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmds.h> +#include <rpm/rpmds.h> #include "debug.h" @@ -1,11 +1,11 @@ #include "system.h" -#include <rpmgi.h> -#include <rpmcli.h> +#include <rpm/rpmgi.h> +#include <rpm/rpmcli.h> -#include <rpmte.h> +#include <rpm/rpmte.h> -#include <rpmmacro.h> +#include <rpm/rpmmacro.h> #include "rpmio/fts.h" #include <popt.h> diff --git a/lib/tplatform.c b/lib/tplatform.c index ae698dfdd..925a5d5e6 100644 --- a/lib/tplatform.c +++ b/lib/tplatform.c @@ -1,9 +1,9 @@ #include "system.h" #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmio.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmio.h> #define _ETC_RPM_PLATFORM "/etc/rpm/platform" static const char * platform = _ETC_RPM_PLATFORM; diff --git a/lib/transaction.c b/lib/transaction.c index cfede3b1b..4f195fe00 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -3,18 +3,18 @@ */ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> -#include <rpmmacro.h> /* XXX for rpmExpand */ -#include <rpmlog.h> +#include <rpm/rpmmacro.h> /* XXX for rpmExpand */ +#include <rpm/rpmlog.h> #include "lib/fsm.h" #include "lib/psm.h" -#include <rpmdb.h> +#include <rpm/rpmdb.h> #include "rpmdb/rpmdb_internal.h" /* XXX for dbiIndexSetCount */ -#include <rpmds.h> +#include <rpm/rpmds.h> #include "lib/rpmlock.h" @@ -26,13 +26,13 @@ #include "lib/cpio.h" #include "rpmdb/fprint.h" -#include <rpmfileutil.h> -#include <rpmstring.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmstring.h> #include "lib/misc.h" /* currentDirectory */ #include "debug.h" -#include <idtx.h> +#include <rpm/idtx.h> /** */ @@ -1,7 +1,7 @@ #include "system.h" -#include <rpmcli.h> -#include <rpmts.h> -#include <rpmlog.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmts.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/lib/tsystem.c b/lib/tsystem.c index 13137813f..f96f80a1d 100644 --- a/lib/tsystem.c +++ b/lib/tsystem.c @@ -2,7 +2,7 @@ #include <pthread.h> -#include <rpmsq.h> +#include <rpm/rpmsq.h> #include <popt.h> #include "debug.h" diff --git a/lib/tthread.c b/lib/tthread.c index 271f1f1af..b4cbb829c 100644 --- a/lib/tthread.c +++ b/lib/tthread.c @@ -2,11 +2,11 @@ #include <pthread.h> #include <assert.h> -#include <rpmlib.h> -#include <rpmts.h> -#include <rpmsq.h> /* XXX for _rpmsq_debug */ -#include <rpmio.h> -#include <rpmlog.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmts.h> +#include <rpm/rpmsq.h> /* XXX for _rpmsq_debug */ +#include <rpm/rpmio.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/lib/verify.c b/lib/verify.c index 742341ae1..bb3361563 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -5,14 +5,14 @@ #include "system.h" -#include <rpmcli.h> -#include <rpmlog.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmlog.h> #include "lib/psm.h" -#include <rpmfi.h> -#include <rpmts.h> +#include <rpm/rpmfi.h> +#include <rpm/rpmts.h> -#include "rpmfileutil.h" +#include <rpm/rpmfileutil.h> #include "rpmio/ugid.h" /* uidToUname(), gnameToGid */ #include "debug.h" diff --git a/python/Makefile.am b/python/Makefile.am index ebe33a39f..a1818b9bd 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = rpmdebug-py.c rpm/__init__.py if PYTHON -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += -I$(top_srcdir)/python AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ diff --git a/python/header-py.c b/python/header-py.c index cfd5e1772..09568b3f2 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -4,12 +4,12 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmstring.h> #include "lib/legacy.h" /* XXX expand/compressFilelist(), providePackageNVR() */ -#include <rpmts.h> /* XXX rpmtsCreate/rpmtsFree */ +#include <rpm/rpmts.h> /* XXX rpmtsCreate/rpmtsFree */ #include "header-py.h" #include "rpmds-py.h" diff --git a/python/header-py.h b/python/header-py.h index f7cd5c723..5410d721d 100644 --- a/python/header-py.h +++ b/python/header-py.h @@ -1,7 +1,7 @@ #ifndef RPMPYTHON_HEADER #define RPMPYTHON_HEADER -#include <rpmlib.h> +#include <rpm/rpmlib.h> /** \ingroup py_c * \file python/header-py.h diff --git a/python/rpmal-py.c b/python/rpmal-py.c index f941aa24f..84df79b97 100644 --- a/python/rpmal-py.c +++ b/python/rpmal-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "rpmal-py.h" #include "rpmds-py.h" diff --git a/python/rpmal-py.h b/python/rpmal-py.h index 4e939fccf..810c5ed2e 100644 --- a/python/rpmal-py.h +++ b/python/rpmal-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMAL_PY #define H_RPMAL_PY -#include <rpmal.h> +#include <rpm/rpmal.h> /** \ingroup py_c * \file python/rpmal-py.h diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c index 026d319c6..c07350ea3 100644 --- a/python/rpmdb-py.c +++ b/python/rpmdb-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "rpmdb-py.h" #include "rpmmi-py.h" diff --git a/python/rpmdb-py.h b/python/rpmdb-py.h index a4883cd79..0e6284e95 100644 --- a/python/rpmdb-py.h +++ b/python/rpmdb-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMDB_PY #define H_RPMDB_PY -#include <rpmdb.h> +#include <rpm/rpmdb.h> /** \ingroup py_c * \file python/rpmdb-py.h diff --git a/python/rpmds-py.c b/python/rpmds-py.c index 6dc563f4e..a7a3179e5 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -4,8 +4,8 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmstring.h> #include "header-py.h" #include "rpmds-py.h" diff --git a/python/rpmds-py.h b/python/rpmds-py.h index 42670a1e2..c029e97dc 100644 --- a/python/rpmds-py.h +++ b/python/rpmds-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMDS_PY #define H_RPMDS_PY -#include <rpmds.h> +#include <rpm/rpmds.h> /** \ingroup py_c * \file python/rpmds-py.h diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c index a69cba27d..ffdc29de5 100644 --- a/python/rpmfd-py.c +++ b/python/rpmfd-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmio.h> /* XXX fdGetFILE */ +#include <rpm/rpmio.h> /* XXX fdGetFILE */ #include "header-py.h" /* XXX pyrpmError */ #include "rpmfd-py.h" diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c index 0cc4e0ff5..5508d5a88 100644 --- a/python/rpmfi-py.c +++ b/python/rpmfi-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "header-py.h" #include "rpmfi-py.h" diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h index 37cde0ec2..cb7575009 100644 --- a/python/rpmfi-py.h +++ b/python/rpmfi-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMFI_PY #define H_RPMFI_PY -#include <rpmfi.h> +#include <rpm/rpmfi.h> /** \ingroup py_c * \file python/rpmfi-py.h diff --git a/python/rpmmacro-py.c b/python/rpmmacro-py.c index 148786298..9e58ef277 100644 --- a/python/rpmmacro-py.c +++ b/python/rpmmacro-py.c @@ -7,7 +7,7 @@ #include "structmember.h" #include "rpmmacro-py.h" -#include <rpmmacro.h> +#include <rpm/rpmmacro.h> #include "debug.h" diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c index 0988a9557..783be04d2 100644 --- a/python/rpmmi-py.c +++ b/python/rpmmi-py.c @@ -4,8 +4,8 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmdb.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmdb.h> #include "rpmmi-py.h" #include "header-py.h" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 0d90048f8..b6b509ecf 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -4,9 +4,9 @@ #include "system.h" -#include <rpmdb.h> -#include <rpmsq.h> -#include <rpmlog.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmsq.h> +#include <rpm/rpmlog.h> #include "header-py.h" #include "rpmal-py.h" diff --git a/python/rpmps-py.c b/python/rpmps-py.c index d31f42647..df20140d9 100644 --- a/python/rpmps-py.c +++ b/python/rpmps-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "rpmps-py.h" diff --git a/python/rpmps-py.h b/python/rpmps-py.h index 0970a9703..86844f622 100644 --- a/python/rpmps-py.h +++ b/python/rpmps-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMPS_PY #define H_RPMPS_PY -#include <rpmps.h> +#include <rpm/rpmps.h> /** \ingroup py_c * \file python/rpmps-py.h diff --git a/python/rpmte-py.c b/python/rpmte-py.c index 95131854a..cc8db45f5 100644 --- a/python/rpmte-py.c +++ b/python/rpmte-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "header-py.h" /* XXX tagNumFromPyObject */ #include "rpmds-py.h" diff --git a/python/rpmte-py.h b/python/rpmte-py.h index 8dd6315d0..103827409 100644 --- a/python/rpmte-py.h +++ b/python/rpmte-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMTE_PY #define H_RPMTE_PY -#include <rpmte.h> +#include <rpm/rpmte.h> /** \ingroup py_c * \file python/rpmte-py.h diff --git a/python/rpmts-py.c b/python/rpmts-py.c index 6d90cc766..46571d2d6 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -4,11 +4,11 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmpgp.h> -#include <rpmdb.h> -#include <rpmbuild.h> -#include <idtx.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmpgp.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmbuild.h> +#include <rpm/idtx.h> #include "header-py.h" #include "rpmds-py.h" /* XXX for rpmdsNew */ diff --git a/python/rpmts-py.h b/python/rpmts-py.h index f4ccf171b..fbc64e049 100644 --- a/python/rpmts-py.h +++ b/python/rpmts-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMTS_PY #define H_RPMTS_PY -#include <rpmts.h> +#include <rpm/rpmts.h> /** \ingroup py_c * \file python/rpmts-py.h diff --git a/python/spec-py.h b/python/spec-py.h index d69098399..8004d1efd 100644 --- a/python/spec-py.h +++ b/python/spec-py.h @@ -1,7 +1,7 @@ #ifndef RPMPYTHON_SPEC #define RPMPYTHON_SPEC -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> /** \ingroup py_c * \file python/spec-py.h @@ -10,6 +10,6 @@ Version: @VERSION@ URL: http://rpm.org # Requires: # Conflicts: -Cflags: -I${includedir}/rpm +Cflags: -I${includedir}/ Libs: -L${libdir} -lrpmbuild -lrpm -lrpmdb -lrpmio -lrpmmisc Libs.private: -lpopt -lmagic -lrt -lpthread @WITH_SELINUX_LIB@ @WITH_SQLITE3_LIB@ @WITH_DB_LIB@ @WITH_BZ2_LIB@ @WITH_ZLIB_LIB@ @WITH_NSS_LIB@ diff --git a/rpm2cpio.c b/rpm2cpio.c index c5d586c71..bc06110c3 100644 --- a/rpm2cpio.c +++ b/rpm2cpio.c @@ -3,10 +3,10 @@ #include "system.h" const char *__progname; -#include <rpmlib.h> -#include <rpmpgp.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmpgp.h> -#include <rpmts.h> +#include <rpm/rpmts.h> #include "debug.h" diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index e83924613..5260a3771 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/rpm.am -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +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@ @@ -39,8 +39,8 @@ endif tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmtag.h @echo '#include "system.h"' > $@ - @echo '#include <header.h>' >> $@ - @echo '#include <rpmtag.h>' >> $@ + @echo '#include <rpm/header.h>' >> $@ + @echo '#include <rpm/rpmtag.h>' >> $@ @echo '#include "debug.h"' >> $@ @echo '' >> $@ @echo 'static const struct headerTagTableEntry_s rpmTagTbl[] = {' >> $@ diff --git a/rpmdb/db3.c b/rpmdb/db3.c index a65be0984..1a6d9d489 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -10,13 +10,13 @@ static int _debug = 1; /* XXX if < 0 debugging, > 0 unusual error returns */ #include <sys/ipc.h> #endif -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmurl.h> /* XXX urlPath proto */ -#include <rpmfileutil.h> /* rpmioMkPath */ +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmurl.h> /* XXX urlPath proto */ +#include <rpm/rpmfileutil.h> /* rpmioMkPath */ #include "rpmdb/rpmdb_internal.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index b21d5993b..2edf3914a 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -4,10 +4,10 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmstring.h> -#include <rpmlog.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmstring.h> +#include <rpm/rpmlog.h> #include "rpmdb/rpmdb_internal.h" #include "debug.h" diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c index 0a6359014..d32e1086f 100644 --- a/rpmdb/fprint.c +++ b/rpmdb/fprint.c @@ -5,7 +5,7 @@ #include "system.h" #include "rpmdb/rpmdb_internal.h" -#include <rpmfileutil.h> /* for rpmCleanPath */ +#include <rpm/rpmfileutil.h> /* for rpmCleanPath */ #include "rpmdb/fprint.h" #include "debug.h" diff --git a/rpmdb/fprint.h b/rpmdb/fprint.h index d04a645df..078d010dc 100644 --- a/rpmdb/fprint.h +++ b/rpmdb/fprint.h @@ -7,7 +7,7 @@ */ #include "rpmdb/rpmhash.h" -#include <header.h> +#include <rpm/header.h> /** */ diff --git a/rpmdb/hdrNVR.c b/rpmdb/hdrNVR.c index 4d5d56912..ae24ece56 100644 --- a/rpmdb/hdrNVR.c +++ b/rpmdb/hdrNVR.c @@ -3,7 +3,7 @@ */ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "debug.h" int headerNVR(Header h, const char **np, const char **vp, const char **rp) diff --git a/rpmdb/header.c b/rpmdb/header.c index ceedc9cb1..43214036a 100644 --- a/rpmdb/header.c +++ b/rpmdb/header.c @@ -10,7 +10,7 @@ #include "system.h" -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "rpmdb/header_internal.h" #include "debug.h" diff --git a/rpmdb/header.h b/rpmdb/header.h index c063093b2..3b1d4d061 100644 --- a/rpmdb/header.h +++ b/rpmdb/header.h @@ -79,8 +79,8 @@ /* RPM - Copyright (C) 1995-2001 Red Hat Software */ -#include <rpmio.h> -#include <rpmints.h> +#include <rpm/rpmio.h> +#include <rpm/rpmints.h> #ifdef __cplusplus extern "C" { diff --git a/rpmdb/header_common.c b/rpmdb/header_common.c index 4d10e36fa..fe3f4685c 100644 --- a/rpmdb/header_common.c +++ b/rpmdb/header_common.c @@ -2,7 +2,7 @@ * \file rpmdb/header_common.c */ -#include <header.h> +#include <rpm/header.h> #include "rpmdb/header_method.h" /** \ingroup header diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h index c8f34b77e..2b6a2247b 100644 --- a/rpmdb/header_internal.h +++ b/rpmdb/header_internal.h @@ -5,7 +5,7 @@ * \file rpmdb/header_internal.h */ -#include <header.h> +#include <rpm/header.h> #include "rpmdb/header_method.h" #include <netinet/in.h> diff --git a/rpmdb/header_method.h b/rpmdb/header_method.h index 333884b8c..535b9a593 100644 --- a/rpmdb/header_method.h +++ b/rpmdb/header_method.h @@ -6,7 +6,7 @@ * Header method prototypes */ -#include <header.h> +#include <rpm/header.h> /** \ingroup header * Create new (empty) header instance. diff --git a/rpmdb/poptDB.c b/rpmdb/poptDB.c index ac209e155..db3266306 100644 --- a/rpmdb/poptDB.c +++ b/rpmdb/poptDB.c @@ -5,7 +5,7 @@ #include "system.h" -#include <rpmcli.h> +#include <rpm/rpmcli.h> #include "debug.h" diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index db0fa87f8..c05b5d9cb 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -14,18 +14,18 @@ #include <regex.h> -#include <rpmurl.h> -#include <rpmpgp.h> -#include <rpmpgp.h> -#include <rpmmacro.h> -#include <rpmsq.h> -#include <rpmstring.h> -#include <rpmfileutil.h> -#include <rpmds.h> /* XXX isInstallPreReq macro only */ - -#include <rpmlog.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmpgp.h> +#include <rpm/rpmpgp.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmsq.h> +#include <rpm/rpmstring.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmds.h> /* XXX isInstallPreReq macro only */ + +#include <rpm/rpmlog.h> #include "rpmdb/rpmdb_internal.h" -#include <rpmdb.h> +#include <rpm/rpmdb.h> #include "rpmdb/fprint.h" #include "rpmdb/header_internal.h" /* XXX for HEADERFLAG_ALLOCATED */ #include "debug.h" diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h index be419def2..92b4eb7bc 100644 --- a/rpmdb/rpmdb.h +++ b/rpmdb/rpmdb.h @@ -6,8 +6,8 @@ * Access RPM indices using Berkeley DB interface(s). */ -#include <rpmlib.h> -#include <rpmsw.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmsw.h> #ifdef __cplusplus extern "C" { diff --git a/rpmdb/rpmdb_internal.h b/rpmdb/rpmdb_internal.h index d9190d8c3..aa99651fe 100644 --- a/rpmdb/rpmdb_internal.h +++ b/rpmdb/rpmdb_internal.h @@ -3,8 +3,8 @@ #include <assert.h> -#include <rpmsw.h> -#include <rpmlib.h> +#include <rpm/rpmsw.h> +#include <rpm/rpmlib.h> #include <db.h> /** diff --git a/rpmdb/rpmhash.c b/rpmdb/rpmhash.c index 24766dc45..5ea0ca756 100644 --- a/rpmdb/rpmhash.c +++ b/rpmdb/rpmhash.c @@ -4,7 +4,7 @@ */ #include "system.h" -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "rpmdb/rpmhash.h" #include "debug.h" diff --git a/rpmdb/sqlite.c b/rpmdb/sqlite.c index 3d1b6ae7c..07e551241 100644 --- a/rpmdb/sqlite.c +++ b/rpmdb/sqlite.c @@ -26,14 +26,14 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmlog.h> -#include <rpmmacro.h> -#include <rpmurl.h> /* XXX urlPath proto */ -#include <rpmfileutil.h> /* rpmioMkpath */ +#include <rpm/rpmlib.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmurl.h> /* XXX urlPath proto */ +#include <rpm/rpmfileutil.h> /* rpmioMkpath */ #include "rpmdb/rpmdb_internal.h" -#include <rpmdb.h> +#include <rpm/rpmdb.h> #include <sqlite3.h> diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c index f7a27486b..90f463ec4 100644 --- a/rpmdb/tagname.c +++ b/rpmdb/tagname.c @@ -4,8 +4,8 @@ #include "system.h" -#include <rpmlib.h> -#include <rpmstring.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmstring.h> #include "debug.h" struct headerTagIndices_s { diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 093cccde7..7f33c4ce9 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,6 +1,6 @@ # Makefile for rpm library. -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ AM_CPPFLAGS += @WITH_LUA_INCLUDE@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@ diff --git a/rpmio/argv.c b/rpmio/argv.c index 64cfd64c2..c39c9d118 100644 --- a/rpmio/argv.c +++ b/rpmio/argv.c @@ -4,7 +4,7 @@ #include "system.h" -#include <argv.h> +#include <rpm/argv.h> #include "debug.h" diff --git a/rpmio/digest.h b/rpmio/digest.h index 0abc45570..c4dabb855 100644 --- a/rpmio/digest.h +++ b/rpmio/digest.h @@ -2,7 +2,7 @@ #define _RPMDIGEST_H #include "rpmio/base64.h" -#include <rpmpgp.h> +#include <rpm/rpmpgp.h> #include <nss.h> #include <sechash.h> diff --git a/rpmio/fts.c b/rpmio/fts.c index 4b747a961..7c34700a6 100644 --- a/rpmio/fts.c +++ b/rpmio/fts.c @@ -64,8 +64,8 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif #include "system.h" #include "rpmio/fts.h" -#include <rpmio.h> -#include <rpmurl.h> +#include <rpm/rpmio.h> +#include <rpm/rpmurl.h> # define __set_errno(val) (*__errno_location ()) = (val) # define __open open # define __close close diff --git a/rpmio/macro.c b/rpmio/macro.c index 2c1ca0416..753ee9be7 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -12,17 +12,17 @@ #define STREQ(_t, _f, _fn) ((_fn) == (sizeof(_t)-1) && !strncmp((_t), (_f), (_fn))) -#include <rpmio.h> -#include <rpmstring.h> -#include <rpmfileutil.h> -#include <rpmurl.h> -#include <rpmlog.h> +#include <rpm/rpmio.h> +#include <rpm/rpmstring.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmlog.h> #ifdef WITH_LUA #include "rpmio/rpmlua.h" #endif -#include <rpmmacro.h> +#include <rpm/rpmmacro.h> #include "debug.h" diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c index a1e128776..b3323db3a 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.c @@ -14,11 +14,11 @@ #endif #include "rpmio/rpmio_internal.h" -#include <rpmfileutil.h> -#include <rpmurl.h> -#include <rpmmacro.h> -#include <rpmlog.h> -#include <argv.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> +#include <rpm/argv.h> static int open_dso(const char * path, pid_t * pidp, size_t *fsizep) { diff --git a/rpmio/rpmfileutil.h b/rpmio/rpmfileutil.h index 9c49ffaff..0fd68141e 100644 --- a/rpmio/rpmfileutil.h +++ b/rpmio/rpmfileutil.h @@ -6,8 +6,8 @@ * File and path manipulation helper functions. */ -#include <rpmio.h> -#include <rpmpgp.h> +#include <rpm/rpmio.h> +#include <rpm/rpmpgp.h> /** \ingroup rpmfileutil */ diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 0aae1f705..21cd92123 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -24,10 +24,10 @@ extern int h_errno; #include "rpmio/rpmio_internal.h" #include "rpmio/ugid.h" -#include <argv.h> -#include <rpmlog.h> -#include <rpmmacro.h> -#include <rpmfileutil.h> +#include <rpm/argv.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmfileutil.h> #include "debug.h" diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index 65bacffb4..38d5e10a7 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -12,7 +12,7 @@ #include <stdlib.h> #include <unistd.h> -#include <rpmsw.h> +#include <rpm/rpmsw.h> #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 256fc2c85..3af593b4f 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -7,11 +7,11 @@ #include <assert.h> -#include <rpmio.h> -#include <rpmurl.h> +#include <rpm/rpmio.h> +#include <rpm/rpmurl.h> -#include <rpmpgp.h> -#include <rpmsw.h> +#include <rpm/rpmpgp.h> +#include <rpm/rpmsw.h> #include "rpmio/digest.h" /** \ingroup rpmio diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 73d7c4029..450e57fe4 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -4,7 +4,7 @@ #include "system.h" #include <stdarg.h> -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" static int nrecs = 0; diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.c index 142613ca5..a13e698d3 100644 --- a/rpmio/rpmlua.c +++ b/rpmio/rpmlua.c @@ -1,10 +1,10 @@ #include "system.h" #ifdef WITH_LUA -#include <rpmio.h> -#include <rpmmacro.h> -#include <rpmlog.h> -#include <rpmurl.h> +#include <rpm/rpmio.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmurl.h> #include "rpmio/rpmhook.h" #include <lua.h> diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 7b38a3db3..c556d12d3 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -7,7 +7,7 @@ #include "rpmio/digest.h" #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "debug.h" diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h index 8186b0772..a174c3b86 100644 --- a/rpmio/rpmpgp.h +++ b/rpmio/rpmpgp.h @@ -12,7 +12,7 @@ #include <string.h> #include <stdio.h> -#include <rpmints.h> +#include <rpm/rpmints.h> #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c index 466e548fd..d1cfc7119 100644 --- a/rpmio/rpmsq.c +++ b/rpmio/rpmsq.c @@ -64,7 +64,7 @@ static pthread_mutex_t rpmsigTbl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; #endif /* HAVE_PTHREAD_H */ #define _RPMSQ_INTERNAL -#include <rpmsq.h> +#include <rpm/rpmsq.h> #include "debug.h" diff --git a/rpmio/rpmsq.h b/rpmio/rpmsq.h index 42a2d6d89..bbb7c1890 100644 --- a/rpmio/rpmsq.h +++ b/rpmio/rpmsq.h @@ -6,7 +6,7 @@ * */ -#include <rpmsw.h> +#include <rpm/rpmsw.h> #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmstring.c b/rpmio/rpmstring.c index 3e747b12f..dae235949 100644 --- a/rpmio/rpmstring.c +++ b/rpmio/rpmstring.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "debug.h" #define BUF_CHUNK 1024 diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.c index d530d5427..ea17afbec 100644 --- a/rpmio/rpmsw.c +++ b/rpmio/rpmsw.c @@ -3,7 +3,7 @@ */ #include "system.h" -#include <rpmsw.h> +#include <rpm/rpmsw.h> #include "debug.h" static rpmtime_t rpmsw_overhead = 0; diff --git a/rpmio/strcasecmp.c b/rpmio/strcasecmp.c index 686851d4c..79f030a10 100644 --- a/rpmio/strcasecmp.c +++ b/rpmio/strcasecmp.c @@ -3,7 +3,7 @@ */ #include "system.h" -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "debug.h" int xstrcasecmp(const char * s1, const char * s2) diff --git a/rpmio/tax.c b/rpmio/tax.c index 2f0f6407d..5c2621492 100644 --- a/rpmio/tax.c +++ b/rpmio/tax.c @@ -1,6 +1,6 @@ #include "system.h" -#include <rpmpgp.h> +#include <rpm/rpmpgp.h> #include "rpmio/base64.h" #include <popt.h> diff --git a/rpmio/tdir.c b/rpmio/tdir.c index df12f9ed6..3e673b159 100644 --- a/rpmio/tdir.c +++ b/rpmio/tdir.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tfts.c b/rpmio/tfts.c index 62a9e5076..dbf141774 100644 --- a/rpmio/tfts.c +++ b/rpmio/tfts.c @@ -2,8 +2,8 @@ #include "rpmio/fts.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tget.c b/rpmio/tget.c index 9e4f21eef..18e5d14ba 100644 --- a/rpmio/tget.c +++ b/rpmio/tget.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tglob.c b/rpmio/tglob.c index 3f51ea08c..213c4039d 100644 --- a/rpmio/tglob.c +++ b/rpmio/tglob.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/thkp.c b/rpmio/thkp.c index d5a1e0084..133d8413b 100644 --- a/rpmio/thkp.c +++ b/rpmio/thkp.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tput.c b/rpmio/tput.c index c337e161b..4814d0ddd 100644 --- a/rpmio/tput.c +++ b/rpmio/tput.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/trpmio.c b/rpmio/trpmio.c index 3d58b72f6..3438bee96 100644 --- a/rpmio/trpmio.c +++ b/rpmio/trpmio.c @@ -3,7 +3,7 @@ */ #include <stdio.h> -#include <rpmio.h> +#include <rpm/rpmio.h> #include "debug.h" int main (void) diff --git a/rpmio/tsw.c b/rpmio/tsw.c index f9c4518e4..e68f36bf8 100644 --- a/rpmio/tsw.c +++ b/rpmio/tsw.c @@ -1,5 +1,5 @@ #include "system.h" -#include <rpmsw.h> +#include <rpm/rpmsw.h> #include "debug.h" int diff --git a/rpmio/tufdio.c b/rpmio/tufdio.c index f2751add8..3345bccbd 100644 --- a/rpmio/tufdio.c +++ b/rpmio/tufdio.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmurl.h> +#include <rpm/rpmurl.h> #include "rpmio/rpmio_internal.h" #include <stdarg.h> diff --git a/rpmio/url.c b/rpmio/url.c index fd9a50d34..e6fbd6dc7 100644 --- a/rpmio/url.c +++ b/rpmio/url.c @@ -7,10 +7,10 @@ #include <assert.h> #include <netinet/in.h> -#include <rpmmacro.h> -#include <rpmlog.h> -#include <rpmurl.h> -#include <rpmio.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmio.h> #include "debug.h" @@ -11,14 +11,14 @@ const char *__progname; #define IAM_RPMK #endif -#include <rpmcli.h> -#include <rpmbuild.h> -#include <rpmlog.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmbuild.h> +#include <rpm/rpmlog.h> -#include <rpmdb.h> +#include <rpm/rpmdb.h> #include "rpmdb/rpmdb_internal.h" /* XXX for freeing dbiTags */ -#include <rpmps.h> -#include <rpmts.h> +#include <rpm/rpmps.h> +#include <rpm/rpmts.h> #ifdef IAM_RPMBT #include "build.h" diff --git a/tools/convertdb1.c b/tools/convertdb1.c index 1f67bd565..7e2572228 100644 --- a/tools/convertdb1.c +++ b/tools/convertdb1.c @@ -7,10 +7,10 @@ const char *__progname; #include <string.h> #endif -#include <rpmlib.h> -#include <rpmdb.h> -#include <rpmio.h> -#include <rpmmacro.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmio.h> +#include <rpm/rpmmacro.h> #include "lib/legacy.h" #define FA_MAGIC 0x02050920 diff --git a/tools/debugedit.c b/tools/debugedit.c index cf8fb1f24..745708ad6 100644 --- a/tools/debugedit.c +++ b/tools/debugedit.c @@ -39,8 +39,8 @@ #include <gelf.h> #include <dwarf.h> -#include <rpmio.h> -#include <rpmpgp.h> +#include <rpm/rpmio.h> +#include <rpm/rpmpgp.h> #include "tools/hashtab.h" #define DW_TAG_partial_unit 0x3c diff --git a/tools/dump.c b/tools/dump.c index d1b2bc232..9878ff369 100644 --- a/tools/dump.c +++ b/tools/dump.c @@ -1,7 +1,7 @@ #include "system.h" const char *__progname; -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "rpmdb/header_internal.h" #include "debug.h" diff --git a/tools/dumpdb.c b/tools/dumpdb.c index 297fd615c..224410916 100644 --- a/tools/dumpdb.c +++ b/tools/dumpdb.c @@ -1,10 +1,10 @@ #include "system.h" const char *__progname; -#include <rpmlib.h> +#include <rpm/rpmlib.h> #include "rpmdb/header_internal.h" -#include <rpmdb.h> +#include <rpm/rpmdb.h> #include "debug.h" diff --git a/tools/rpmcache.c b/tools/rpmcache.c index 96d12c5c4..63f620cec 100644 --- a/tools/rpmcache.c +++ b/tools/rpmcache.c @@ -8,13 +8,13 @@ const char *__progname; #include <fnmatch.h> #include "rpmio/fts.h" -#include <rpmcli.h> -#include <rpmlog.h> +#include <rpm/rpmcli.h> +#include <rpm/rpmlog.h> -#include <rpmps.h> -#include <rpmdb.h> -#include <rpmds.h> -#include <rpmts.h> +#include <rpm/rpmps.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmds.h> +#include <rpm/rpmts.h> #include "lib/misc.h" /* for rpmMkdirPath */ diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c index 5cdaed81a..fb906dfca 100644 --- a/tools/rpmdeps.c +++ b/tools/rpmdeps.c @@ -1,10 +1,10 @@ #include "system.h" const char *__progname; -#include <rpmbuild.h> -#include <argv.h> -#include <rpmds.h> -#include <rpmfc.h> +#include <rpm/rpmbuild.h> +#include <rpm/argv.h> +#include <rpm/rpmds.h> +#include <rpm/rpmfc.h> #include "debug.h" diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c index ba54d8931..81b89fc2a 100644 --- a/tools/rpmgraph.c +++ b/tools/rpmgraph.c @@ -1,16 +1,16 @@ #include "system.h" const char *__progname; -#include <rpmcli.h> +#include <rpm/rpmcli.h> -#include <rpmdb.h> -#include <rpmps.h> -#include <rpmte.h> -#include <rpmts.h> -#include <rpmds.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmps.h> +#include <rpm/rpmte.h> +#include <rpm/rpmts.h> +#include <rpm/rpmds.h> -#include <rpmlog.h> -#include <rpmfileutil.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmfileutil.h> #include "lib/manifest.h" #include "debug.h" diff --git a/tools/rpminject.c b/tools/rpminject.c index 3d806c746..de4499e53 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -1,10 +1,10 @@ #include "system.h" const char *__progname; -#include <rpmbuild.h> +#include <rpm/rpmbuild.h> #include "build/buildio.h" -#include <header.h> +#include <rpm/header.h> #include "lib/rpmlead.h" #include <err.h> /* XXX !HAVE_ERR_H: get from misc */ diff --git a/tools/rpmsort.c b/tools/rpmsort.c index ccb22c023..71182e6d1 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -1,18 +1,18 @@ #include "system.h" const char *__progname; -#include <rpmlib.h> -#include <rpmmacro.h> -#include <rpmurl.h> +#include <rpm/rpmlib.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmurl.h> -#include <rpmdb.h> -#include <rpmps.h> -#include <rpmte.h> -#include <rpmts.h> -#include <rpmds.h> +#include <rpm/rpmdb.h> +#include <rpm/rpmps.h> +#include <rpm/rpmte.h> +#include <rpm/rpmts.h> +#include <rpm/rpmds.h> #include "lib/manifest.h" -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" static int _depends_debug; |