From 5dd1a5baa571b994559579fb6ee6289f51257ee7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Wed, 10 Oct 2007 10:08:26 +0200
Subject: [PATCH] Move pkginc_HEADERS to toplevel Makefile.am

---
 Makefile.am       | 33 +++++++++++++++++++++++++++++++++
 build/Makefile.am |  3 ---
 lib/Makefile.am   |  6 ------
 rpmdb/Makefile.am |  3 ---
 rpmio/Makefile.am |  6 ------
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4713e2a..9abcd9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,39 @@ AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
 
 staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
 
+pkginclude_HEADERS =
+
+pkginclude_HEADERS += rpmio/argv.h
+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/rpmsw.h
+
+pkginclude_HEADERS += rpmdb/header.h
+pkginclude_HEADERS += rpmdb/hdrinline.h
+pkginclude_HEADERS += rpmdb/rpmdb.h 
+
+pkginclude_HEADERS += lib/idtx.h
+pkginclude_HEADERS += lib/rpmcli.h
+pkginclude_HEADERS += lib/rpmlib.h
+pkginclude_HEADERS += lib/rpmal.h
+pkginclude_HEADERS += lib/rpmds.h
+pkginclude_HEADERS += lib/rpmfi.h
+pkginclude_HEADERS += lib/rpmgi.h
+pkginclude_HEADERS += lib/rpmps.h
+pkginclude_HEADERS += lib/rpmte.h
+pkginclude_HEADERS += lib/rpmts.h
+pkginclude_HEADERS += lib/stringbuf.h
+
+pkginclude_HEADERS += build/rpmbuild.h
+pkginclude_HEADERS += build/rpmfc.h
+pkginclude_HEADERS += build/rpmspec.h
+
+
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
 
diff --git a/build/Makefile.am b/build/Makefile.am
index b116b31..1fd3cf9 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -11,9 +11,6 @@ AM_CPPFLAGS = -I. \
 	@WITH_LIBELF_INCLUDE@ \
 	-I$(top_srcdir)/misc
 
-pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = rpmbuild.h rpmfc.h rpmspec.h
-
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpmbuild.la
 librpmbuild_la_SOURCES = \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f5bd775..6a2f6e0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,12 +17,6 @@ EXTRA_DIST = getdate.y
 
 check_PROGRAMS =
 
-pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = \
-	idtx.h rpmcli.h rpmlib.h \
-	rpmal.h rpmds.h rpmfi.h rpmgi.h rpmps.h rpmte.h rpmts.h \
-	stringbuf.h
-
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpm.la
 librpm_la_SOURCES = \
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 6cc963e..881cd81 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -17,9 +17,6 @@ EXTRA_PROGRAMS =
 check_PROGRAMS =
 CLEANFILES =
 
-pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = header.h hdrinline.h rpmdb.h 
-
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpmdb.la
 librpmdb_la_SOURCES = \
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 7d8404e..3b9f853 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -8,12 +8,6 @@ AM_CPPFLAGS = -I. \
 	-I$(top_srcdir)/misc
 AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
 
-pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = \
-	argv.h \
-	rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmpgp.h \
-	rpmsq.h rpmsw.h 
-
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = \
-- 
2.7.4