diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-17 19:41:33 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:39 -0500 |
commit | 92bb5909701b1994c90eb2833315df215f7e386a (patch) | |
tree | 2dd7453f7f3b8e9f99a9328f2e66629a2d73b4d7 /source4/build/smb_build/output.pm | |
parent | dcc730e7fb347baebac1c88c045e782b20b4e20b (diff) | |
download | samba-92bb5909701b1994c90eb2833315df215f7e386a.tar.gz samba-92bb5909701b1994c90eb2833315df215f7e386a.tar.bz2 samba-92bb5909701b1994c90eb2833315df215f7e386a.zip |
r14529: Include $(builddir) where necesary
(This used to be commit ee49674dc6cbda95590409541703c36534b195b3)
Diffstat (limited to 'source4/build/smb_build/output.pm')
-rw-r--r-- | source4/build/smb_build/output.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 594d1d48c7..cf01368aac 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -28,14 +28,14 @@ sub generate_mergedobj($) { my $subsys = shift; - $subsys->{OUTPUT} = $subsys->{TARGET} = "bin/subsystems/$subsys->{TYPE}_$subsys->{NAME}.o"; + $subsys->{OUTPUT} = $subsys->{TARGET} = "\$(builddir)/bin/subsystems/$subsys->{TYPE}_$subsys->{NAME}.o"; } sub generate_objlist($) { my $subsys = shift; - $subsys->{TARGET} = "bin/.$subsys->{TYPE}_$subsys->{NAME}"; + $subsys->{TARGET} = "\$(builddir)/bin/.$subsys->{TYPE}_$subsys->{NAME}"; $subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJ_LIST)"; } @@ -58,15 +58,15 @@ sub generate_shared_library($) $lib_name = "lib$link_name"; } - $lib->{DEBUGDIR} = "bin"; - $lib->{RELEASEDIR} = "bin/install"; + $lib->{DEBUGDIR} = "\$(builddir)/bin"; + $lib->{RELEASEDIR} = "\$(builddir)/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->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}"; + $lib->{DEBUGDIR} = "\$(builddir)/bin/modules/$lib->{SUBSYSTEM}"; } $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT} = $lib->{TARGET}; @@ -86,7 +86,7 @@ sub generate_static_library($) @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); @{$lib->{LINK_FLAGS}} = (); - $lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}"; + $lib->{TARGET} = "\$(builddir)/bin/$lib->{LIBRARY_NAME}"; $lib->{OUTPUT} = "-l".lc($link_name); } @@ -98,8 +98,8 @@ sub generate_binary($) @{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)"); @{$bin->{LINK_FLAGS}} = (); - $bin->{RELEASEDIR} = "bin/install"; - $bin->{DEBUGDIR} = "bin/"; + $bin->{RELEASEDIR} = "\$(builddir)/bin/install"; + $bin->{DEBUGDIR} = "\$(builddir)/bin/"; $bin->{TARGET} = $bin->{OUTPUT} = "$bin->{DEBUGDIR}/$bin->{NAME}"; $bin->{BINARY} = $bin->{NAME}; } |