diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | lib/psm.h | 1 | ||||
| -rw-r--r-- | lib/rpmal.h | 2 | ||||
| -rw-r--r-- | lib/rpmcallback.h (renamed from rpmio/rpmmessages.h) | 12 | ||||
| -rw-r--r-- | lib/rpmcli.h | 1 | ||||
| -rw-r--r-- | lib/rpmlib.h | 1 | ||||
| -rw-r--r-- | lib/rpmps.h | 2 | ||||
| -rw-r--r-- | lib/rpmts.h | 1 | ||||
| -rw-r--r-- | preinstall.am | 8 |
9 files changed, 13 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 579c5a048..07a5d6783 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,6 @@ pkginclude_HEADERS += rpmio/rpmio.h pkginclude_HEADERS += rpmio/rpmurl.h pkginclude_HEADERS += rpmio/rpmmacro.h pkginclude_HEADERS += rpmio/rpmlog.h -pkginclude_HEADERS += rpmio/rpmmessages.h pkginclude_HEADERS += rpmio/rpmpgp.h pkginclude_HEADERS += rpmio/rpmsq.h pkginclude_HEADERS += rpmio/rpmstring.h @@ -55,6 +54,7 @@ pkginclude_HEADERS += rpmdb/rpmdb.h nodist_pkginclude_HEADERS += rpmdb/rpmints.h pkginclude_HEADERS += lib/idtx.h +pkginclude_HEADERS += lib/rpmcallback.h pkginclude_HEADERS += lib/rpmcli.h pkginclude_HEADERS += lib/rpmlib.h pkginclude_HEADERS += lib/rpmal.h @@ -8,6 +8,7 @@ #define _RPMSQ_INTERNAL #include <rpmsq.h> +#include <rpmcallback.h> extern int _psm_debug; diff --git a/lib/rpmal.h b/lib/rpmal.h index a383937aa..084e9e625 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -7,7 +7,7 @@ */ #include <rpmlib.h> /* for rpmds, rpmfi, uint32_t */ -#include <rpmmessages.h> /* for fnpyKey */ +#include <rpmcallback.h> /* for fnpyKey */ #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmmessages.h b/lib/rpmcallback.h index adc5b2892..444fa48b3 100644 --- a/rpmio/rpmmessages.h +++ b/lib/rpmcallback.h @@ -1,16 +1,10 @@ -#ifndef H_RPMMESSAGES -#define H_RPMMESSAGES - -/** \ingroup rpmio - * \file rpmio/rpmmessages.h - * @todo Eliminate from API. - */ +#ifndef _RPMCALLBACK_H +#define _RPMCALLBACK_H #ifdef __cplusplus extern "C" { #endif -/* LCL: ??? */ typedef const void * fnpyKey; /** @@ -53,4 +47,4 @@ typedef void * (*rpmCallbackFunction) } #endif -#endif /* H_RPMMESSAGES */ +#endif /* _RPMCALLBACK_H */ diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 369cde53e..318b75361 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -8,6 +8,7 @@ #include <rpmlib.h> #include <rpmurl.h> #include <rpmmacro.h> +#include <rpmcallback.h> #include <argv.h> #include <idtx.h> diff --git a/lib/rpmlib.h b/lib/rpmlib.h index a7f6778f9..c83675bca 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -9,7 +9,6 @@ */ #include <rpmio.h> -#include <rpmmessages.h> #include <header.h> #include <popt.h> diff --git a/lib/rpmps.h b/lib/rpmps.h index b1aa9f15b..84bed9e9c 100644 --- a/lib/rpmps.h +++ b/lib/rpmps.h @@ -6,7 +6,7 @@ * Structures and prototypes used for an "rpmps" problem set. */ -#include <rpmmessages.h> /* for fnpyKey */ +#include <rpmcallback.h> /* for fnpyKey */ #ifdef __cplusplus extern "C" { diff --git a/lib/rpmts.h b/lib/rpmts.h index 27e77b6de..fb6e43177 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -10,6 +10,7 @@ #include <rpmps.h> #include <rpmsw.h> #include <rpmpgp.h> +#include <rpmcallback.h> #ifdef __cplusplus extern "C" { diff --git a/preinstall.am b/preinstall.am index f936fdaed..848a70341 100644 --- a/preinstall.am +++ b/preinstall.am @@ -22,10 +22,6 @@ include/rpm/rpmlog.h: rpmio/rpmlog.h include/rpm/$(dirstamp) $(INSTALL_DATA) $(top_srcdir)/rpmio/rpmlog.h include/rpm/rpmlog.h BUILT_SOURCES += include/rpm/rpmlog.h CLEANFILES += include/rpm/rpmlog.h -include/rpm/rpmmessages.h: rpmio/rpmmessages.h include/rpm/$(dirstamp) - $(INSTALL_DATA) $(top_srcdir)/rpmio/rpmmessages.h include/rpm/rpmmessages.h -BUILT_SOURCES += include/rpm/rpmmessages.h -CLEANFILES += include/rpm/rpmmessages.h include/rpm/rpmpgp.h: rpmio/rpmpgp.h include/rpm/$(dirstamp) $(INSTALL_DATA) $(top_srcdir)/rpmio/rpmpgp.h include/rpm/rpmpgp.h BUILT_SOURCES += include/rpm/rpmpgp.h @@ -58,6 +54,10 @@ include/rpm/idtx.h: lib/idtx.h include/rpm/$(dirstamp) $(INSTALL_DATA) $(top_srcdir)/lib/idtx.h include/rpm/idtx.h BUILT_SOURCES += include/rpm/idtx.h CLEANFILES += include/rpm/idtx.h +include/rpm/rpmcallback.h: lib/rpmcallback.h include/rpm/$(dirstamp) + $(INSTALL_DATA) $(top_srcdir)/lib/rpmcallback.h include/rpm/rpmcallback.h +BUILT_SOURCES += include/rpm/rpmcallback.h +CLEANFILES += include/rpm/rpmcallback.h include/rpm/rpmcli.h: lib/rpmcli.h include/rpm/$(dirstamp) $(INSTALL_DATA) $(top_srcdir)/lib/rpmcli.h include/rpm/rpmcli.h BUILT_SOURCES += include/rpm/rpmcli.h |