diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 15:21:33 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 15:21:33 +0100 |
| commit | 9be199944d29d8f3c8e25ad96c02c824d2853b54 (patch) | |
| tree | b8900763a2a93e1da1cb93b6f0b1fb7fedf5b186 /source4/build/smb_build/output.pm | |
| parent | c8011b5d09390318ea6aa5639a142797128e5dab (diff) | |
| parent | 07f6f9b2115b3df03ac11a0db9bf1c4ff5d513cc (diff) | |
| download | samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.tar.gz samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.tar.bz2 samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.zip | |
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts:
source/Makefile
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dynconfig.mk
source/scripting/python/config.mk
(This used to be commit 744d9fd8731321abea37b0cb14ca75e1b4654722)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index eec438b108..1ddd39d261 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -69,9 +69,6 @@ sub generate_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}; - } else { - $lib->{TARGET_MERGED_OBJ} = ""; - $lib->{RESULT_MERGED_OBJ} = ""; } } @@ -92,10 +89,6 @@ sub generate_static_library($) $lib->{TARGET_STATIC_LIBRARY} = $lib->{RESULT_STATIC_LIBRARY}; $lib->{STATICDIR} = 'bin/static'; $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name); - } else { - $lib->{RESULT_STATIC_LIBRARY} = ""; - $lib->{TARGET_STATIC_LIBRARY} = ""; - $lib->{OUTPUT_STATIC_LIBRARY} = ""; } } |