summaryrefslogtreecommitdiff
path: root/rpmdb
diff options
context:
space:
mode:
Diffstat (limited to 'rpmdb')
-rw-r--r--rpmdb/Makefile.am6
-rw-r--r--rpmdb/db3.c10
-rw-r--r--rpmdb/dbconfig.c8
-rw-r--r--rpmdb/fprint.c2
-rw-r--r--rpmdb/fprint.h2
-rw-r--r--rpmdb/hdrNVR.c2
-rw-r--r--rpmdb/header.c2
-rw-r--r--rpmdb/header.h4
-rw-r--r--rpmdb/header_common.c2
-rw-r--r--rpmdb/header_internal.h2
-rw-r--r--rpmdb/header_method.h2
-rw-r--r--rpmdb/poptDB.c2
-rw-r--r--rpmdb/rpmdb.c22
-rw-r--r--rpmdb/rpmdb.h4
-rw-r--r--rpmdb/rpmdb_internal.h4
-rw-r--r--rpmdb/rpmhash.c2
-rw-r--r--rpmdb/sqlite.c12
-rw-r--r--rpmdb/tagname.c4
18 files changed, 46 insertions, 46 deletions
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 {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 02:48:11 +0000