diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 21:46:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:07 -0500 |
| commit | b00c2369069c41880598ff430776cc26e8f7b916 (patch) | |
| tree | fe483e7721681d6f5ffc0271a15366a615e260c9 /source4/build/smb_build/input.pm | |
| parent | ab8fd44603c6ac140e6d0c29fd6a1a1065f616a3 (diff) | |
| download | samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.gz samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.bz2 samba-b00c2369069c41880598ff430776cc26e8f7b916.zip | |
r15301: Use static libraries internally. This required a few hacks in the build
system - these should be removed later on.
(This used to be commit 06547391669e064d2b92f5841b7df5f101a34cb9)
Diffstat (limited to 'source4/build/smb_build/input.pm')
| -rw-r--r-- | source4/build/smb_build/input.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 887677243d..3084381661 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -124,7 +124,7 @@ sub import_integrated($$) next if($mod->{SUBSYSTEM} ne $lib->{NAME}); next if($mod->{ENABLE} ne "YES"); - push (@{$lib->{FULL_OBJ_LIST}}, "\$($mod->{TYPE}_$mod->{NAME}_OBJ_LIST)"); + push (@{$lib->{FULL_OBJ_LIST}}, "\$($mod->{TYPE}_$mod->{NAME}_FULL_OBJ_LIST)"); push (@{$lib->{LINK_FLAGS}}, "\$($mod->{TYPE}_$mod->{NAME}_LINK_FLAGS)"); push (@{$lib->{PRIVATE_DEPENDENCIES}}, @{$mod->{PUBLIC_DEPENDENCIES}}) if defined($mod->{PUBLIC_DEPENDENCIES}); push (@{$lib->{PRIVATE_DEPENDENCIES}}, @{$mod->{PRIVATE_DEPENDENCIES}}) if defined($mod->{PRIVATE_DEPENDENCIES}); @@ -146,8 +146,6 @@ sub calc_unique_deps($$$$$$) if (defined ($dep->{OUTPUT_TYPE}) && ($withlibs or - ($dep->{OUTPUT_TYPE} eq "OBJ_LIST") or - ($dep->{OUTPUT_TYPE} eq "MERGEDOBJ") or ($dep->{OUTPUT_TYPE} eq "INTEGRATED") or ($dep->{OUTPUT_TYPE} eq "STATIC_LIBRARY"))) { push (@$busy, $dep->{NAME}); |