summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-29 14:32:37 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 14:32:37 +0100
commit21208d3303ec13056f706ee74132822a7dd2f36a (patch)
tree7897f2f83e31593fb3c5560713cd6fc205a6a442
parent1ada7108408f567f61cfbf2b625730ba898452db (diff)
downloadsamba-21208d3303ec13056f706ee74132822a7dd2f36a.tar.gz
samba-21208d3303ec13056f706ee74132822a7dd2f36a.tar.bz2
samba-21208d3303ec13056f706ee74132822a7dd2f36a.zip
Fix typos, avoid DEPEND_LIST from growing with empty elements.
(This used to be commit b30fd477ff0d97bb4de3c5301a6cdc47867451ee)
-rw-r--r--source4/build/smb_build/makefile.pm4
-rw-r--r--source4/build/smb_build/output.pm7
-rw-r--r--source4/scripting/python/config.mk3
3 files changed, 3 insertions, 11 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 06f9d4b194..5fe0e68e95 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index ff9afe8e8c..4ae4a62cf4 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/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/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b68abdba5e..a16d737344 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/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/*