build-sys: Rename AM_CFLAGS/LDFLAGS to MY_CFLAGS/LDFLAGS

To avoid the following warning use MY_ as a prefix for the offending
variables that have AM_ as a prefix:

configure.ac:587: warning: macro 'AM_CFLAGS' not found in library
configure.ac:590: warning: macro 'AM_LDFLAGS' not found in library

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

diff --git a/configure.ac b/configure.ac
index d70849ac0d45f710b65221473c45befe80fe480d..3acb946036259851a3fe6cfedc764643ebc147c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -537,10 +537,10 @@ if test "$with_seccomp" != "no"; then
                      [whether to build in seccomp profile (Linux only)])
 fi
 
-AM_CFLAGS="$CFLAGS"
-AM_LDFLAGS="$LDFLAGS"
-AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_LDFLAGS])
+MY_CFLAGS="$CFLAGS"
+MY_LDFLAGS="$LDFLAGS"
+AC_SUBST([MY_CFLAGS])
+AC_SUBST([MY_LDFLAGS])
 
 AC_CONFIG_FILES([Makefile                   \
                debian/swtpm-tools.postinst \
@@ -584,10 +584,10 @@ echo
 echo "Version to build  : $PACKAGE_VERSION"
 echo "Crypto library    : $cryptolib"
 echo
-echo "        AM_CFLAGS = $AM_CFLAGS"
+echo "        MY_CFLAGS = $MY_CFLAGS"
 echo " HARDENING_CFLAGS = $HARDENING_CFLAGS"
 echo "HARDENING_LDFLAGS = $HARDENING_LDFLAGS"
-echo "       AM_LDFLAGS = $AM_LDFLAGS"
+echo "       MY_LDFLAGS = $MY_LDFLAGS"
 echo "  LIBSECCOMP_LIBS = $LIBSECCOMP_LIBS"
 echo " JSON_GLIB_CFLAGS = $JSON_GLIB_CFLAGS"
 echo "   JSON_GLIB_LIBS = $JSON_GLIB_LIBS"

diff --git a/src/swtpm/Makefile.am b/src/swtpm/Makefile.am
index a0e7bbb9bfa32bb1c69f9da81b383d6d64809dad..567535f759b7044cb3c6b4a6649ead7e48af9138 100644 (file)
--- a/src/swtpm/Makefile.am
+++ b/src/swtpm/Makefile.am
@@ -4,8 +4,8 @@
 # For the license, see the COPYING file in the root directory.
 #
 
-AM_CFLAGS = @AM_CFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
 
 noinst_HEADERS = \
        capabilities.h \
@@ -64,13 +64,13 @@ libswtpm_libtpms_la_CFLAGS = \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/swtpm \
-       $(AM_CFLAGS) \
+       $(MY_CFLAGS) \
        $(HARDENING_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBSECCOMP_CFLAGS)
 
 libswtpm_libtpms_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
+       $(MY_LDFLAGS) \
        $(HARDENING_LDFLAGS)
 
 libswtpm_libtpms_la_LIBADD = \
@@ -100,14 +100,14 @@ swtpm_CFLAGS = \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/swtpm \
-       $(AM_CFLAGS) \
+       $(MY_CFLAGS) \
        $(HARDENING_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBFUSE_CFLAGS) \
        -DHAVE_SWTPM_CUSE_MAIN
 
 swtpm_LDFLAGS = \
-       $(AM_LDFLAGS) \
+       $(MY_LDFLAGS) \
        $(HARDENING_LDFLAGS)
 
 swtpm_LDADD = \
@@ -126,13 +126,13 @@ swtpm_cuse_CFLAGS = \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/swtpm \
-       $(AM_CFLAGS) \
+       $(MY_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBFUSE_CFLAGS) \
        $(HARDENING_CFLAGS)
 
 swtpm_cuse_LDFLAGS = \
-       $(AM_LDFLAGS) \
+       $(MY_LDFLAGS) \
        $(HARDENING_LDFLAGS)
 
 swtpm_cuse_LDADD = \