[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1153-gb30fd47
Jelmer Vernooij
jelmer at samba.org
Fri Feb 29 13:32:55 GMT 2008
The branch, v4-0-test has been updated
via b30fd477ff0d97bb4de3c5301a6cdc47867451ee (commit)
from 6c659689ed4081f1d7a6253c538c7f01784197ba (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit b30fd477ff0d97bb4de3c5301a6cdc47867451ee
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Feb 29 14:32:37 2008 +0100
Fix typos, avoid DEPEND_LIST from growing with empty elements.
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/makefile.pm | 4 ++--
source/build/smb_build/output.pm | 7 -------
source/scripting/python/config.mk | 3 +--
3 files changed, 3 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 06f9d4b..5fe0e68 100644
--- 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 ff9afe8..4ae4a62 100644
--- 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 b68abdb..a16d737 100644
--- 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/*
--
Samba Shared Repository
More information about the samba-cvs
mailing list