Fix issue that prevents you overriding CFLAGS at the make command line.

Change-Id: Ia387ad57f865ec8786fcdb03074489946906d2dc Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
intel · Dec 20, 2017 · ffa758e · ffa758e
1 parent 81ed197
commit ffa758e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/.tools/Makefile.am b/.tools/Makefile.am
@@ -80,7 +80,7 @@ CC = cc
 AM_CPPFLAGS = $(includes) $(include_enable_usdm) $(includes_driver) \
 				$(includes_enable_qat_mux)
 
-CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
+AM_CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
 		$(cflags_qat_contig_mem) $(cflags_enable_multi_thread) \
 		$(cflags_enable_usdm) $(cflags_mux) $(enable_qat_rsa) \
 		$(enable_qat_ciphers) $(enable_qat_ecdh) $(enable_qat_ecdsa) \

diff --git a/.tools/Makefile.in b/.tools/Makefile.in
@@ -143,17 +143,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = cc
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
-		$(cflags_qat_contig_mem) $(cflags_enable_multi_thread) \
-		$(cflags_enable_usdm) $(cflags_mux) $(enable_qat_rsa) \
-		$(enable_qat_ciphers) $(enable_qat_ecdh) $(enable_qat_ecdsa) \
-		$(enable_qat_dsa) $(enable_qat_dh) $(enable_qat_prf) \
-		$(enable_qat_small_pkt_offload) \
-		$(enable_qat_lenstra_protection) \
-		$(enable_qat_debug) $(enable_qat_warnings) \
-		$(enable_qat_mem_debug) $(enable_qat_mem_warnings) \
-		$(cflags_qat_debug_file)
-
+CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -373,6 +363,17 @@ include_HEADERS = ${OPENSSL_COMMON_HDR} \
 AM_CPPFLAGS = $(includes) $(include_enable_usdm) $(includes_driver) \
 				$(includes_enable_qat_mux)
 
+AM_CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
+		$(cflags_qat_contig_mem) $(cflags_enable_multi_thread) \
+		$(cflags_enable_usdm) $(cflags_mux) $(enable_qat_rsa) \
+		$(enable_qat_ciphers) $(enable_qat_ecdh) $(enable_qat_ecdsa) \
+		$(enable_qat_dsa) $(enable_qat_dh) $(enable_qat_prf) \
+		$(enable_qat_small_pkt_offload) \
+		$(enable_qat_lenstra_protection) \
+		$(enable_qat_debug) $(enable_qat_warnings) \
+		$(enable_qat_mem_debug) $(enable_qat_mem_warnings) \
+		$(cflags_qat_debug_file)
+
 libqat_la_LDFLAGS = $(QAT_SHARED_LIB_DEPS_LD) \
 					$(QAT_SHARED_LIB_DEPS_UPSTREAM_DRIVER) \
 					$(QAT_SHARED_LIB_DEPS_DRIVER) \