sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

Fix typos, avoid DEPEND_LIST from growing with empty elements.

Browse Source 
(This used to be commit b30fd477ff0d97bb4de3c5301a6cdc47867451ee)
This commit is contained in:
Jelmer Vernooij 2008-02-29 14:32:37 +01:00
parent 1ada710840
commit 21208d3303
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/build/smb_build/makefile.pm
View File

@ -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__

7
source4/build/smb_build/output.pm
View File

@ -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} = "";
}
}

3
source4/scripting/python/config.mk
View File

@ -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/*