diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-13 18:54:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:13 -0500 |
| commit | b67cf4ce262c834015ffda7bbbc1c62711f097aa (patch) | |
| tree | a6e28bd29fac764aa21fd4f0c92091a6efd296dc /source4/build/smb_build/output.pm | |
| parent | e47f76e96dde0ab53a51a6cd66372eafa2b1385d (diff) | |
| download | samba-b67cf4ce262c834015ffda7bbbc1c62711f097aa.tar.gz samba-b67cf4ce262c834015ffda7bbbc1c62711f097aa.tar.bz2 samba-b67cf4ce262c834015ffda7bbbc1c62711f097aa.zip | |
r14335: Build shared modules in bin/modules/$SUBSYSTEM when in developer mode.
(This used to be commit 4799f7bd1fbf0ed3cd4c52bd6eef129666ac74b5)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 2a0d592895..15ce5a78b0 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -58,12 +58,17 @@ sub generate_shared_library($) $lib_name = "lib$link_name"; } + $lib->{BUILDDIR} = "bin"; + $lib->{INSTALLDIR} = "bin/install"; $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "$lib_name.\$(SHLIBEXT)"; + if (defined($lib->{VERSION})) { $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}"; $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}"; + } elsif ($lib->{TYPE} eq "MODULE") { + $lib->{BUILDDIR} = "bin/modules/$lib->{SUBSYSTEM}"; } - $lib->{TARGET} = "bin/$lib->{LIBRARY_REALNAME}"; + $lib->{TARGET} = "$lib->{BUILDDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT} = $lib->{TARGET}; } @@ -93,7 +98,9 @@ sub generate_binary($) @{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)"); @{$bin->{LINK_FLAGS}} = (); - $bin->{TARGET} = $bin->{OUTPUT} = "bin/$bin->{NAME}"; + $bin->{INSTALLDIR} = "bin/install"; + $bin->{BUILDDIR} = "bin/"; + $bin->{TARGET} = $bin->{OUTPUT} = "$bin->{BUILDDIR}/$bin->{NAME}"; $bin->{BINARY} = $bin->{NAME}; } |