Fix typos, avoid DEPEND_LIST from growing with empty elements.

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 06f9d4b1943c3a9a2b58d6942ac57fce4db04317..5fe0e68e9525f2260bf55d2ee0a077c0d59d9ae6 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -253,7 +253,7 @@ sub SharedLibrary($$)
 #
 $ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$\@
-       \@mkdir -p \$(D@)
+       \@mkdir -p \$(\@D)
        \@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
                \$($ctx->{NAME}\_FULL_OBJ_LIST) \\
                \$($ctx->{NAME}_LINK_FLAGS) \\
@@ -274,7 +274,7 @@ sub MergedObj($$)
 #
 $ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_LIST)
        \@echo Partially linking \$@
-       \@mkdir -p \$(D@)
+       \@mkdir -p \$(\@D)
        \$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_LIST)
 
 __EOD__

diff --git a/source/build/smb_build/output.pm b/source/build/smb_build/output.pm
index ff9afe8e8c9f09d459bd0c7e86160070ab3a1f91..4ae4a62cf4991ff50c5dc9a83331f18abaa5b510 100644 (file)
--- a/source/build/smb_build/output.pm
+++ b/source/build/smb_build/output.pm
@@ -101,9 +101,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} = "";
        }
 }
 
@@ -124,10 +121,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} = "";
        }
 }
 

diff --git a/source/scripting/python/config.mk b/source/scripting/python/config.mk
index b68abdba5e4df0238b8e3b33cea6746bdbd49144..a16d737344c9b45622e3870003da894a54cf625c 100644 (file)
--- a/source/scripting/python/config.mk
+++ b/source/scripting/python/config.mk
@@ -25,7 +25,6 @@ swig:: pythonmods
 
 realdistclean::
        @echo "Removing SWIG output files"
-       @-rm -rf bin/python/*
        # FIXME: Remove _wrap.c files
 
 pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
@@ -47,4 +46,4 @@ installpython:: pythonmods
 
 clean::
        @echo "Removing python modules"
-       @rm -f bin/python/*
+       @rm -rf bin/python/*