diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-28 12:07:20 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-05-28 12:07:20 +1000 |
| commit | 275e057bea09c1d15228963a5b5650df28a4b24b (patch) | |
| tree | fc24aee4174815930451e86f73d1997028169a49 /source4/build | |
| parent | 0dbef08a9a4ae127f4eaf80dfbbb00e000bdf866 (diff) | |
| parent | 715cee3bdbabd86b7603fbb43da470bdb8c1fe9d (diff) | |
| download | samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.gz samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.bz2 samba-275e057bea09c1d15228963a5b5650df28a4b24b.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ecb0e5477aa63180daade5c597e7ac2aebfc1e15)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 652a52fa60..8c7d75221c 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -25,7 +25,6 @@ my $section_types = { "PUBLIC_DEPENDENCIES" => "list", "ENABLE" => "bool", "LDFLAGS" => "list", - "CFLAGS" => "list", }, "SUBSYSTEM" => { "PRIVATE_DEPENDENCIES" => "list", @@ -60,7 +59,6 @@ my $section_types = { "ENABLE" => "bool", "INSTALLDIR" => "string", - "CFLAGS" => "list", "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 0269cfe8a3..73801c25fd 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -262,6 +262,10 @@ sub CFlags($$) if($src_ne_build) { if($flag =~ m#^-I([^/].*$)#) { my $dir = $1; + if ($dir =~ /^\$\(/) { + push (@cflags, $flag); + next; + } $dir =~ s#^\$\((?:src|build)dir\)/?##; push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir"); next; diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index f9f12c3a73..76c6d3fc8f 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -52,7 +52,7 @@ sub generate_shared_library($) $lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name"; - $lib->{TARGET_SHARED_LIBRARY} = $lib->{RESULT_SHARED_LIBRARY}; + $lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_DEBUGNAME}"; } sub generate_merged_obj($) |