diff options
| -rw-r--r-- | build/Makefile.am | 20 | ||||
| -rw-r--r-- | lib/Makefile.am | 14 | ||||
| -rw-r--r-- | python/Makefile.am | 22 | ||||
| -rw-r--r-- | rpmdb/Makefile.am | 20 | ||||
| -rw-r--r-- | rpmio/Makefile.am | 12 |
5 files changed, 44 insertions, 44 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index 1fd3cf997..039db7e0d 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,15 +1,15 @@ # Makefile for rpmbuild library. -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir)/rpmio \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_MAGIC_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - @WITH_LIBELF_INCLUDE@ \ - -I$(top_srcdir)/misc +AM_CPPFLAGS = -I. +AM_CPPFLAGS += -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@ +AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@ +AM_CPPFLAGS += @WITH_POPT_INCLUDE@ +AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@ +AM_CPPFLAGS += -I$(top_srcdir)/misc usrlibdir = $(libdir) usrlib_LTLIBRARIES = librpmbuild.la diff --git a/lib/Makefile.am b/lib/Makefile.am index 6a2f6e0b7..5e5b4bda9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,12 +1,12 @@ # Makefile for rpm library. -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir)/rpmio \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc +AM_CPPFLAGS = -I. +AM_CPPFLAGS += -I$(top_srcdir) +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 += -DLOCALEDIR="\"$(localedir)\"" AM_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\"" AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\"" diff --git a/python/Makefile.am b/python/Makefile.am index fff05aaae..9cdebd44e 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -3,17 +3,17 @@ EXTRA_DIST = rpmdebug-py.c rpm/__init__.py if PYTHON -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir)/rpmio \ - @WITH_LIBELF_INCLUDE@ \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc \ - -I$(top_srcdir)/ \ - -I@WITH_PYTHON_INCLUDE@ +AM_CPPFLAGS = -I. +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_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 pkgpyexec_SCRIPTS = rpm/__init__.py diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index 57b9db850..0086778f6 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -2,16 +2,16 @@ include $(top_srcdir)/rpm.am -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmio \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc \ - @WITH_SQLITE3_INCLUDE@ \ - @WITH_LIBELF_INCLUDE@ +AM_CPPFLAGS = -I. +AM_CPPFLAGS += -I$(top_srcdir) +AM_CPPFLAGS += -I$(top_srcdir)/build +AM_CPPFLAGS += -I$(top_srcdir)/lib +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_SQLITE3_INCLUDE@ +AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@ check_PROGRAMS = EXTRA_PROGRAMS = diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index e753d3f27..e9bd6b39e 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,11 +1,11 @@ # Makefile for rpm library. -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_LUA_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc +AM_CPPFLAGS = -I. +AM_CPPFLAGS += -I$(top_srcdir) +AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@ +AM_CPPFLAGS += @WITH_LUA_INCLUDE@ +AM_CPPFLAGS += @WITH_POPT_INCLUDE@ +AM_CPPFLAGS += -I$(top_srcdir)/misc AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" usrlibdir = $(libdir) |