Add stub rpmtypes.h header stub

- place to stick in common typedefs to untangle header cross-include jungle

diff --git a/Makefile.am b/Makefile.am
index c45d542..284b15e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ pkginclude_HEADERS += lib/rpmps.h
 pkginclude_HEADERS += lib/rpmtag.h
 pkginclude_HEADERS += lib/rpmte.h
 pkginclude_HEADERS += lib/rpmts.h
+pkginclude_HEADERS += lib/rpmtypes.h
 
 pkginclude_HEADERS += build/rpmbuild.h
 pkginclude_HEADERS += build/rpmfc.h

diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h
new file mode 100644 (file)
index 0000000..96a17a0
--- /dev/null
+++ b/lib/rpmtypes.h
@@ -0,0 +1,10 @@
+#ifndef _RPMTYPES_H
+#define _RPMTYPES_H
+
+/** \ingroup rpmtypes
+ * \file lib/rpmtypes.h
+ */
+
+#include <rpm/rpmints.h>
+
+#endif /* _RPMTYPES_H */

diff --git a/preinstall.am b/preinstall.am
index d1a73e0..6470028 100644 (file)
--- a/preinstall.am
+++ b/preinstall.am
@@ -98,6 +98,10 @@ include/rpm/rpmts.h: lib/rpmts.h include/rpm/$(dirstamp)
        $(INSTALL_DATA) $(top_srcdir)/lib/rpmts.h include/rpm/rpmts.h
 BUILT_SOURCES += include/rpm/rpmts.h
 CLEANFILES += include/rpm/rpmts.h
+include/rpm/rpmtypes.h: lib/rpmtypes.h include/rpm/$(dirstamp)
+       $(INSTALL_DATA) $(top_srcdir)/lib/rpmtypes.h include/rpm/rpmtypes.h
+BUILT_SOURCES += include/rpm/rpmtypes.h
+CLEANFILES += include/rpm/rpmtypes.h
 include/rpm/rpmbuild.h: build/rpmbuild.h include/rpm/$(dirstamp)
        $(INSTALL_DATA) $(top_srcdir)/build/rpmbuild.h include/rpm/rpmbuild.h
 BUILT_SOURCES += include/rpm/rpmbuild.h

diff --git a/rpmdb/header.h b/rpmdb/header.h
index 975b7fb..3f6a8e5 100644 (file)
--- a/rpmdb/header.h
+++ b/rpmdb/header.h
@@ -80,7 +80,7 @@
 /* RPM - Copyright (C) 1995-2001 Red Hat Software */
 
 #include <rpm/rpmio.h>
-#include <rpm/rpmints.h>
+#include <rpm/rpmtypes.h>
 
 #ifdef __cplusplus
 extern "C" {