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

r19575: Build static libs in bin/static rather than bin/

Browse Source 
(This used to be commit c9b06ce5636c37ddb077513796a288d88f62c358)
This commit is contained in:
Jelmer Vernooij 2006-11-06 17:28:27 +00:00 committed by Gerald (Jerry) Carter
parent 09a36ffab1
commit 8164c24149
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ sub _prepare_compiler_linker($)
$libdir = "\$(builddir)/bin/shared"; $libdir = "\$(builddir)/bin/shared";
$devld_install = " -Wl,-rpath-link,\$(builddir)/bin/shared"; $devld_install = " -Wl,-rpath-link,\$(builddir)/bin/shared";
} else { } else {
$libdir = "\$(builddir)/bin"; $libdir = "\$(builddir)/bin/static";
} }
if (!(abs_path($self->{config}->{srcdir}) eq abs_path($self->{config}->{builddir}))) { if (!(abs_path($self->{config}->{srcdir}) eq abs_path($self->{config}->{builddir}))) {
@ -248,14 +248,14 @@ sub SharedLibrary($$)
$proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/; $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/;
$self->output(<< "__EOD__" $self->output(<< "__EOD__"
$ctx->{SHAREDDIR}/$ctx->{NAME}_init_module.c: bin/$ctx->{NAME}_init_module.c:
\@echo Creating \$\@ \@echo Creating \$\@
\@echo \"#include \\\"includes.h\\\"\" > \$\@ \@echo \"#include \\\"includes.h\\\"\" > \$\@
\@echo \"$proto_fn;\" >> \$\@ \@echo \"$proto_fn;\" >> \$\@
\@echo -e \"_PUBLIC_ $init_fn \\n{\\n\\treturn $ctx->{INIT_FUNCTION}();\\n}\\n\" >> \$\@ \@echo -e \"_PUBLIC_ $init_fn \\n{\\n\\treturn $ctx->{INIT_FUNCTION}();\\n}\\n\" >> \$\@
__EOD__ __EOD__
); );
$init_obj = "$ctx->{SHAREDDIR}/$ctx->{NAME}_init_module.o"; $init_obj = "bin/$ctx->{NAME}_init_module.o";
} }
my $soarg = ""; my $soarg = "";

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

@ -89,7 +89,7 @@ sub generate_static_library($)
push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)");
if (defined($lib->{OBJ_FILES})) { if (defined($lib->{OBJ_FILES})) {
$lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}"; $lib->{TARGET} = "bin/static/$lib->{LIBRARY_NAME}";
} else { } else {
$lib->{TARGET} = ""; $lib->{TARGET} = "";
} }

2
source4/main.mk
View File

@ -253,7 +253,7 @@ clean:: clean_pch
@-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) $(TORTURE_PROGS) @-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) $(TORTURE_PROGS)
@echo Removing libraries @echo Removing libraries
@-rm -f $(STATIC_LIBRARIES) $(SHARED_LIBRARIES) @-rm -f $(STATIC_LIBRARIES) $(SHARED_LIBRARIES)
@-rm -f bin/*.a bin/shared/*.$(SHLIBEXT) @-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT)
@echo Removing modules @echo Removing modules
@-rm -f bin/modules/*/*.$(SHLIBEXT) @-rm -f bin/modules/*/*.$(SHLIBEXT)
@-rm -f bin/*_init_module.c @-rm -f bin/*_init_module.c