Merge branch 'v4-0-test' into v4-0-gmake3

[abartlet/samba.git/.git] / source4 / build / smb_build / output.pm

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index eec438b1082c560f16712994bec9d9a857b18988..1ddd39d2611b639db8f1e66ac710ec6422407793 100644 (file)
--- 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} = "";
        }
 }