diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-12-08 14:02:32 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-12-08 14:02:32 +0200 |
| commit | 9ce13e09ef42ea4efca3c624054b0b719f06a43b (patch) | |
| tree | 1660a7c311fba0c86afba2cacea8669f07b8eb51 /lib | |
| parent | 179ebc1745b51eb9821dd783c9df475ac539532d (diff) | |
| download | rpm-9ce13e09ef42ea4efca3c624054b0b719f06a43b.tar.gz rpm-9ce13e09ef42ea4efca3c624054b0b719f06a43b.tar.bz2 rpm-9ce13e09ef42ea4efca3c624054b0b719f06a43b.zip | |
Switch to <rpm/foo.h> style for public headers
- adjust include paths accordingly
Diffstat (limited to 'lib')
58 files changed, 212 insertions, 212 deletions
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" |