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>
cms-externals · Dec 9, 2016 · 3d4db6f · 3d4db6f
1 parent 4e6583f
commit 3d4db6f
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
 # Makefile for rpm library.
 
 include $(top_srcdir)/rpm.am
+AM_CFLAGS = @RPMCFLAGS@
 
 EXTRA_DIST = rpm/__init__.py rpm/transaction.py
 

diff --git a/rpm.am.in → rpm.am b/rpm.am.in → rpm.am
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 include $(top_srcdir)/rpm.am
+AM_CFLAGS = @RPMCFLAGS@
 
 EXTRA_DIST =
 CLEANFILES =
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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@