From 659f66c9bab55970319adf271283f41fa6ce42e1 Mon Sep 17 00:00:00 2001 From: Peter Clifton Date: Thu, 3 Jan 2013 02:58:17 +0000 Subject: [PATCH] src/Makefile.am: We don't gain anything by setting AM_CFLAGS to C_OR_CXX_FLAGS We were duplicating command-line flags un-necessarily, and it does not stop the a build with the C++ compiler using CFLAGS, as was (in hindsight) the original intention before commit 72cdf2ecef3361a00fbd0ee3e540f7383e62272c where I changed a complete CFLAGS override to a AM_CFLAGS addition. As we should not override CFLAGS in a Makefile (it prevents the user from setting CFLAGS at "make" time), I'm removing this completely. --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 602ebaa8b3..66c957b7eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,6 @@ SUBDIRS= icons CC = @CC_OR_CXX@ -AM_CFLAGS = @CC_OR_CXX_FLAGS@ pcbtreedir= @PCBTREEDIR@ pcblibdir= @PCBLIBDIR@ @@ -26,7 +25,7 @@ bin_PROGRAMS= pcb if DEBUG_BUILD # don't disable assert() else -AM_CFLAGS += -DNDEBUG +AM_CFLAGS= -DNDEBUG endif PCB_SRCS = \ -- 2.11.4.GIT