diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-13 21:42:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:21 -0500 |
| commit | 470ba9434a3f10f8a53bacaac89204700adb89c4 (patch) | |
| tree | 680abc6eef1ce17a7e40fbb628192e6d8f0893b0 /source4/build/smb_build/output.pm | |
| parent | 085aac2e01f1f921a4b2d415872f5b8df3eb6635 (diff) | |
| download | samba-470ba9434a3f10f8a53bacaac89204700adb89c4.tar.gz samba-470ba9434a3f10f8a53bacaac89204700adb89c4.tar.bz2 samba-470ba9434a3f10f8a53bacaac89204700adb89c4.zip | |
r12219: Use some more common functions
(This used to be commit 57ea480c24ff914dfa6cbc5a309020b21fa4af39)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 92b2f05c62..b7a9653b2b 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -36,7 +36,7 @@ sub generate_objlist($) my $subsys = shift; $subsys->{TARGET} = "bin/.$subsys->{TYPE}_$subsys->{NAME}"; - $subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJS)"; + $subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJ_LIST)"; } sub generate_shared_library($) @@ -45,7 +45,7 @@ sub generate_shared_library($) my $link_name; @{$lib->{DEPEND_LIST}} = (); - @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)"); + @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); $link_name = $lib->{NAME}; $link_name =~ s/^LIB//; @@ -73,7 +73,7 @@ sub generate_static_library($) $link_name =~ s/^LIB//; $lib->{LIBRARY_NAME} = "lib".lc($link_name).".a"; - @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)"); + @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); @{$lib->{LINK_FLAGS}} = (); $lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}"; @@ -85,7 +85,7 @@ sub generate_binary($) my $bin = shift; @{$bin->{DEPEND_LIST}} = (); - @{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJS)"); + @{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)"); @{$bin->{LINK_FLAGS}} = (); $bin->{TARGET} = $bin->{OUTPUT} = "bin/$bin->{NAME}"; |