Cleanup CPPFLAGS.

diff --git a/Makefile.am b/Makefile.am
index 82654e8..a915969 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,15 +19,15 @@ DIST_SUBDIRS = po misc db3 lua rpmio rpmdb lib build python scripts doc tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/build \
-       -I$(top_srcdir)/lib \
-       -I$(top_srcdir)/rpmdb \
-       -I$(top_srcdir)/rpmio \
-       @WITH_BEECRYPT_INCLUDE@ \
-       @WITH_POPT_INCLUDE@ \
-       -I$(top_srcdir)/misc \
-       @WITH_LIBELF_INCLUDE@
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/build
+AM_CPPFLAGS += -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/rpmdb
+AM_CPPFLAGS += -I$(top_srcdir)/rpmio
+AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
+AM_CPPFLAGS += @WITH_POPT_INCLUDE@
+AM_CPPFLAGS += -I$(top_srcdir)/misc
+AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
 AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
 AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""

diff --git a/build/Makefile.am b/build/Makefile.am
index 039db7e..c17a127 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for rpmbuild library.
 
-AM_CPPFLAGS = -I.
-AM_CPPFLAGS += -I$(top_srcdir)
+AM_CPPFLAGS =  -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/build
 AM_CPPFLAGS += -I$(top_srcdir)/lib
 AM_CPPFLAGS += -I$(top_srcdir)/rpmdb
 AM_CPPFLAGS += -I$(top_srcdir)/rpmio

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5e5b4bd..6568083 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for rpm library.
 
-AM_CPPFLAGS = -I.
-AM_CPPFLAGS += -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/lib
 AM_CPPFLAGS += -I$(top_srcdir)/rpmdb
 AM_CPPFLAGS += -I$(top_srcdir)/rpmio
 AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@

diff --git a/lua/Makefile.am b/lua/Makefile.am
index 1c56295..169878b 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -9,7 +9,8 @@ EXTRA_DIST = \
        local/linit.lua
 
 LDADD = liblua.la
-AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/local
+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)
+AM_CPPFLAGS += -I$(srcdir)/include -I$(srcdir)/local
 
 lua_lua_SOURCES = lua/lua.c
 lua_lua_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_USERCONFIG='"$(srcdir)/local/userconfig.c"'

diff --git a/misc/Makefile.am b/misc/Makefile.am
index c9db0db..5c39491 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile for misc library.
 
-AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/misc
 
 EXTRA_DIST = \
        alloca.c        basename.c      err.c           err.h \

diff --git a/python/Makefile.am b/python/Makefile.am
index 9cdebd4..137f0f6 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -3,7 +3,8 @@
 EXTRA_DIST = rpmdebug-py.c rpm/__init__.py
 
 if PYTHON
-AM_CPPFLAGS = -I.
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/python
 AM_CPPFLAGS += -I$(top_srcdir)/build
 AM_CPPFLAGS += -I$(top_srcdir)/lib
 AM_CPPFLAGS += -I$(top_srcdir)/rpmdb
@@ -12,7 +13,6 @@ AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
 AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
-AM_CPPFLAGS += -I$(top_srcdir)
 AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@
 
 pkgpyexec_LTLIBRARIES = _rpmmodule.la

diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 8ddeaa2..bfca7eb 100644 (file)
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -2,8 +2,8 @@
 
 include $(top_srcdir)/rpm.am
 
-AM_CPPFLAGS = -I.
-AM_CPPFLAGS += -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/rpmdb
 AM_CPPFLAGS += -I$(top_srcdir)/build
 AM_CPPFLAGS += -I$(top_srcdir)/lib
 AM_CPPFLAGS += -I$(top_srcdir)/rpmio

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index e9bd6b3..18d88a0 100644 (file)
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for rpm library.
 
-AM_CPPFLAGS = -I.
-AM_CPPFLAGS += -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(top_srcdir)/rpmio
 AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
 AM_CPPFLAGS += @WITH_LUA_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@