diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-04 00:43:24 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-04 00:43:24 +0100 |
| commit | 2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7 (patch) | |
| tree | e7ecac9f5918df44a6f5abbf130fc3920fa61f35 /source4/build | |
| parent | 19ca598c9cbd08b3bbb133d8bf4e54b628942015 (diff) | |
| download | samba-2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7.tar.gz samba-2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7.tar.bz2 samba-2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7.zip | |
Fix includes.
(This used to be commit 99e61dade2bd9ae2a5dfe17f766528012c09e46c)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/input.pm | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index cd7b7ba2ac..66a0bc723e 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -151,7 +151,6 @@ sub check_python($$$) $dirname .= "/" unless $dirname =~ /\/$/; $dirname = "" if $dirname eq "./"; - $python->{OBJ_FILES} = ["$dirname$basename\_wrap.o"]; $python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)"; $python->{PYTHON_FILES} = ["$dirname$basename.py"]; push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)"); diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 58c9f20670..ffab456d68 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -65,11 +65,9 @@ sub generate_merged_obj($) my $link_name = $lib->{NAME}; $link_name =~ s/^LIB//; - if (defined($lib->{OBJ_FILES})) { - $lib->{MERGED_OBJNAME} = lc($link_name).".o"; - $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}"; - $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ}; - } + $lib->{MERGED_OBJNAME} = lc($link_name).".o"; + $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}"; + $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ}; } sub generate_static_library($) |