diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-06 17:28:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:55 -0500 |
| commit | 8164c241492ff7117e25289d37f7b2adc3f30515 (patch) | |
| tree | cf74286ae06059fa038627c461816d9181ed9ee9 | |
| parent | 09a36ffab14c3f0d7dbedba2432323a35e82930c (diff) | |
| download | samba-8164c241492ff7117e25289d37f7b2adc3f30515.tar.gz samba-8164c241492ff7117e25289d37f7b2adc3f30515.tar.bz2 samba-8164c241492ff7117e25289d37f7b2adc3f30515.zip | |
r19575: Build static libs in bin/static rather than bin/
(This used to be commit c9b06ce5636c37ddb077513796a288d88f62c358)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 6 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 | ||||
| -rw-r--r-- | source4/main.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 22bf95e5b2..78b16599f4 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -114,7 +114,7 @@ sub _prepare_compiler_linker($) $libdir = "\$(builddir)/bin/shared"; $devld_install = " -Wl,-rpath-link,\$(builddir)/bin/shared"; } else { - $libdir = "\$(builddir)/bin"; + $libdir = "\$(builddir)/bin/static"; } if (!(abs_path($self->{config}->{srcdir}) eq abs_path($self->{config}->{builddir}))) { @@ -248,14 +248,14 @@ sub SharedLibrary($$) $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/; $self->output(<< "__EOD__" -$ctx->{SHAREDDIR}/$ctx->{NAME}_init_module.c: +bin/$ctx->{NAME}_init_module.c: \@echo Creating \$\@ \@echo \"#include \\\"includes.h\\\"\" > \$\@ \@echo \"$proto_fn;\" >> \$\@ \@echo -e \"_PUBLIC_ $init_fn \\n{\\n\\treturn $ctx->{INIT_FUNCTION}();\\n}\\n\" >> \$\@ __EOD__ ); - $init_obj = "$ctx->{SHAREDDIR}/$ctx->{NAME}_init_module.o"; + $init_obj = "bin/$ctx->{NAME}_init_module.o"; } my $soarg = ""; diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index e7609e6549..34ed7ae03e 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -89,7 +89,7 @@ sub generate_static_library($) push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); if (defined($lib->{OBJ_FILES})) { - $lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}"; + $lib->{TARGET} = "bin/static/$lib->{LIBRARY_NAME}"; } else { $lib->{TARGET} = ""; } diff --git a/source4/main.mk b/source4/main.mk index c3d232e86c..4779044ad6 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -253,7 +253,7 @@ clean:: clean_pch @-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) $(TORTURE_PROGS) @echo Removing 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 @-rm -f bin/modules/*/*.$(SHLIBEXT) @-rm -f bin/*_init_module.c |