From 1e383687f96772bac61ac349db4d5e5008b50f8c Mon Sep 17 00:00:00 2001 From: zoulasc Date: Wed, 26 Mar 2014 16:18:55 -0400 Subject: [PATCH] Use only the standard cflags for hardened builds (Ian Kent) --- amd/Makefile.am | 2 +- amq/Makefile.am | 2 +- fixmount/Makefile.am | 2 +- fsinfo/Makefile.am | 2 +- hlfsd/Makefile.am | 2 +- libamu/Makefile.am | 2 +- mk-amd-map/Makefile.am | 2 +- wire-test/Makefile.am | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/amd/Makefile.am b/amd/Makefile.am index a532017b..6cdaa99d 100644 --- 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 e3bb3682..ec54eb5a 100644 --- 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 6e8f5804..7f51c579 100644 --- 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 68ad0e98..742bce27 100644 --- 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 bda0d167..959cd8da 100644 --- 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 a866260a..08e58d69 100644 --- 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 e84574fc..b987629e 100644 --- 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 9f6ab483..ceccd1c4 100644 --- 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) -- 2.34.1