From: Amos Jeffries Date: Sat, 21 Nov 2009 05:29:45 +0000 (+1300) Subject: Convert Common.am snippet from @ variable style. X-Git-Tag: SQUID_3_2_0_1~544 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee9215a4ae0a9ec9dba2ba33b2f3ddfa5c42d0b1;p=thirdparty%2Fsquid.git Convert Common.am snippet from @ variable style. --- diff --git a/src/Common.am b/src/Common.am index 0072bc8fff..15c60bb7e6 100644 --- a/src/Common.am +++ b/src/Common.am @@ -4,8 +4,8 @@ ## so it must not contain stuff specific to or bad for some subdirectories. ## TODO: make this set by configure? -AM_CFLAGS = @SQUID_CFLAGS@ -AM_CXXFLAGS = @SQUID_CXXFLAGS@ +AM_CFLAGS = $(SQUID_CFLAGS) +AM_CXXFLAGS = $(SQUID_CXXFLAGS) DEFS = @DEFS@ ## so that others can always use += for these variables @@ -18,11 +18,11 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_builddir)/include \ - @SQUID_CPPUNIT_INC@ + $(SQUID_CPPUNIT_INC) ## Kerberos headers require their include path. ## Because we use libcompat for comm_err.h header protections ... -INCLUDES += @KRB5INCS@ +INCLUDES += $(KRB5INCS) ## make all compiled sources depend on generated files ## XXX: Do we really need this? Does auto-dependency tracking work?