diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-31 08:35:55 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-31 08:35:55 +1000 |
| commit | be14efbdf9de964d36b1fdbc8dec909ad1d2601f (patch) | |
| tree | d46a633b29a0d0f3e1096b21f5da69f611d506e7 /source4/build | |
| parent | 277287114679addc2ef26fbe6a82963f9cf1b196 (diff) | |
| download | samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.tar.gz samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.tar.bz2 samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.zip | |
Revert Jelmer's CFLAGS commit e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c
This commit broke the build, because not all files (libreplace, popt)
were updated.
Andrew Bartlett
(This used to be commit 3faacf4351d68a10aea78b53768571d2059772ae)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/public.m4 | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 8b9a297d47..d932f09a69 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -34,6 +34,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS # Start Subsystem $1 @<:@SUBSYSTEM::$1@:>@ PRIVATE_DEPENDENCIES = $3 +CFLAGS = \$($1_CFLAGS) ENABLE = YES # End Subsystem $1 ################################### diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 0923770729..8c7d75221c 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -32,6 +32,8 @@ my $section_types = { "ENABLE" => "bool", + "CFLAGS" => "list", + "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", "INIT_FUNCTION_SENTINEL" => "string" }, @@ -47,6 +49,8 @@ my $section_types = { "ENABLE" => "bool", "OUTPUT_TYPE" => "list", + + "CFLAGS" => "list" }, "BINARY" => { |