From a3052e79f41afe91dc5a1c898868c632053ce599 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 11 Feb 2008 19:28:59 +0100 Subject: Use make variables in cflags file (now supported by cflags.pl) (This used to be commit d746fcde1006b4b7b33aa65bef9d2fea3ebc9162) --- source4/build/m4/public.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/build/m4/public.m4') diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index e8fbe4b286..d045cf42b7 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -33,7 +33,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS @<:@SUBSYSTEM::$1@:>@ OBJ_FILES = \$($1_OBJ_FILES) PRIVATE_DEPENDENCIES = $3 -CFLAGS = $4 +CFLAGS = \$($1_CFLAGS) ENABLE = YES # End Subsystem $1 ################################### @@ -58,7 +58,7 @@ OBJ_FILES = \$($1_OBJ_FILES) PRIVATE_DEPENDENCIES = $3 VERSION = $4 SO_VERSION = $5 -CFLAGS = $6 +CFLAGS = \$($1_CFLAGS) LDFLAGS = \$($1_LDFLAGS) PC_NAME = $8 ENABLE = YES @@ -152,8 +152,8 @@ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS # Start Ext Lib $1 @<:@EXT_LIB::$1@:>@ LIBS = \$($1_LIBS) -CFLAGS = $3 -CPPFLAGS = $4 +CFLAGS = \$($1_CFLAGS) +CPPFLAGS = \$($1_CPPFLAGS) LDFLAGS = \$($1_LDFLAGS) PC_NAME = $6 # End Ext Lib $1 -- cgit