Use only the standard cflags for hardened builds (Ian Kent)

diff --git a/amd/Makefile.am b/amd/Makefile.am
index a532017b6daaafe39e6a666dae7d0e25c48bbcc6..6cdaa99debd8f3b04c823dade7e507e1eb9b2f45 100644 (file)
--- a/amd/Makefile.am
+++ b/amd/Makefile.am
@@ -147,7 +147,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # dependencies
 $(PROGRAMS): $(LDADD)

diff --git a/amq/Makefile.am b/amq/Makefile.am
index e3bb3682d0652fd158d9a3ffd32a06ca0f21ccfc..ec54eb5ae0fd2e5a48ed83e647bbaf3fa6873f0c 100644 (file)
--- a/amq/Makefile.am
+++ b/amq/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # additional files to distribute and clean
 EXTRA_DIST = $(man_MANS)

diff --git a/fixmount/Makefile.am b/fixmount/Makefile.am
index 6e8f58048b92413a5eb964c078ea266bdd23c5e5..7f51c5798ff4f265670d4a472586dd458aa8aae7 100644 (file)
--- a/fixmount/Makefile.am
+++ b/fixmount/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # additional files to distribute and clean
 EXTRA_DIST = $(man_MANS)

diff --git a/fsinfo/Makefile.am b/fsinfo/Makefile.am
index 68ad0e98a7fdbae5f762878388e295057fd37bea..742bce275b127674c384cc5cbba4087753c11728 100644 (file)
--- a/fsinfo/Makefile.am
+++ b/fsinfo/Makefile.am
@@ -49,7 +49,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 AM_YFLAGS = -d
 
 # dependencies

diff --git a/hlfsd/Makefile.am b/hlfsd/Makefile.am
index bda0d1679e2aa8d4fbd2d87e5adaff57bcef7e7b..959cd8daede41e59e3e837a4d79ebb7eda16f49e 100644 (file)
--- a/hlfsd/Makefile.am
+++ b/hlfsd/Makefile.am
@@ -24,7 +24,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # additional files to distribute and clean
 EXTRA_DIST = $(man_MANS)

diff --git a/libamu/Makefile.am b/libamu/Makefile.am
index a866260adf6a901e396d87233bc1d2bcbdf48e68..08e58d694c96018b6483e3f43a67ef4bbe433b8e 100644 (file)
--- a/libamu/Makefile.am
+++ b/libamu/Makefile.am
@@ -73,7 +73,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # dependencies
 $(libamu_la_OBJECTS) $(libamu_la_LIBADD):      \

diff --git a/mk-amd-map/Makefile.am b/mk-amd-map/Makefile.am
index e84574fc558056c9406b8abdf33a007f71a7c61f..b987629ebdca1b62b2f27f9a35e29fc5afc8ccaa 100644 (file)
--- a/mk-amd-map/Makefile.am
+++ b/mk-amd-map/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # additional files to distribute and clean
 EXTRA_DIST = $(man_MANS)

diff --git a/wire-test/Makefile.am b/wire-test/Makefile.am
index 9f6ab48302e52cce0f400f42793d63e48eb5bb0d..ceccd1c436c8c9a80f2959252b989bb16d857059 100644 (file)
--- a/wire-test/Makefile.am
+++ b/wire-test/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@
-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+AM_CFLAGS = $(AMU_CFLAGS)
 
 # additional files to distribute and clean
 EXTRA_DIST = $(man_MANS)