diff options
| author | Mark Wielaard <mjw@redhat.com> | 2016-12-09 09:31:58 +0100 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2016-12-09 11:35:38 +0200 |
| commit | 3d4db6f99f086711d2865a2a19639e417a97a21c (patch) | |
| tree | 18c52a053bd62d47333d988dff6163424eb2cc11 | |
| parent | 4e6583fe23b372829108ad0b4f8d9beaff5600bd (diff) | |
| download | rpm-3d4db6f99f086711d2865a2a19639e417a97a21c.tar.gz | |
Define AM_CFLAGS inside the Makefile.am files themselves.
Trying to include AM_CFLAGS through a configure generated rpm.am file
doesn't really work because at the time automake runs configure doesn't
exist yet to process rpm.am.in. Just define the AM_CFLAGS substitution
inside the Makefile.am files themselves.
Rename rpm.am.in back to rpm.am.
Signed-off-by: Mark Wielaard <mjw@redhat.com>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | build/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | fileattrs/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | python/Makefile.am | 1 | ||||
| -rw-r--r-- | rpm.am (renamed from rpm.am.in) | 2 | ||||
| -rw-r--r-- | rpmio/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | sign/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
12 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 47bb4bd11..eef237652 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = --with-external-db include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ CLEANFILES = EXTRA_DIST = ChangeLog CREDITS INSTALL \ diff --git a/build/Makefile.am b/build/Makefile.am index f0f55a960..2fa3c3d6c 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpmbuild library. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@ diff --git a/configure.ac b/configure.ac index e08096dc1..4f3be8770 100644 --- a/configure.ac +++ b/configure.ac @@ -892,7 +892,7 @@ AC_PATH_PROG(AUTOM4TE,autom4te,:) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) -AC_CONFIG_FILES([Makefile rpm.am +AC_CONFIG_FILES([Makefile rpmio/Makefile lib/Makefile build/Makefile sign/Makefile po/Makefile.in scripts/Makefile fileattrs/Makefile misc/Makefile diff --git a/fileattrs/Makefile.am b/fileattrs/Makefile.am index 9c55aa111..1895f4426 100644 --- a/fileattrs/Makefile.am +++ b/fileattrs/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm file attributes include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ fattrsdir = $(rpmconfigdir)/fileattrs diff --git a/lib/Makefile.am b/lib/Makefile.am index 7fd6f94e1..c95d674f9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm library. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 5ddc174bf..98eb154d2 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm library. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += -I$(top_srcdir)/misc diff --git a/python/Makefile.am b/python/Makefile.am index cae66f08f..af8b0897f 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm library. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ EXTRA_DIST = rpm/__init__.py rpm/transaction.py @@ -8,5 +8,3 @@ rpmconfigdir = $(prefix)/lib/rpm # Libtool version (current-revision-age) for all our libraries rpm_version_info = 7:0:0 - -AM_CFLAGS = @RPMCFLAGS@ diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 68a821934..5ad4d6818 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm library. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f204c51e1..b1360e192 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm scripts. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ CLEANFILES = diff --git a/sign/Makefile.am b/sign/Makefile.am index 86314ff62..e6129811a 100644 --- a/sign/Makefile.am +++ b/sign/Makefile.am @@ -1,6 +1,7 @@ # Makefile for rpm library. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 5b4c058a6..709122046 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in. include $(top_srcdir)/rpm.am +AM_CFLAGS = @RPMCFLAGS@ EXTRA_DIST = CLEANFILES = |