diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-05-17 00:51:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:50 -0500 |
| commit | e73d051e20f18ab981f540a7178900ac3f3c45fd (patch) | |
| tree | a70f698c9d978ed5f6d6fa2fdc67f94b8fdd1e77 /source4/build/smb_build/input.pm | |
| parent | 29a8069aee510c9dcc1a216a52cc53639621caf9 (diff) | |
| download | samba-e73d051e20f18ab981f540a7178900ac3f3c45fd.tar.gz samba-e73d051e20f18ab981f540a7178900ac3f3c45fd.tar.bz2 samba-e73d051e20f18ab981f540a7178900ac3f3c45fd.zip | |
r6839: Add support for building subsystems as shared libraries. This can be
done by setting:
OUTPUT_TYPE = SHARED_LIBRARY
in the [SUBSYSTEM::...] section belonging to a subsystem.
The idea is to allow multiple values to OUTPUT_TYPE simultaneously
(e.g. OUTPUT_TYPE = SHARED_LIBRARY, STATIC_LIBRARY, OBJLIST )
(This used to be commit b9d0ae93ba86fec0115f58e7940b2a6c908bc809)
Diffstat (limited to 'source4/build/smb_build/input.pm')
| -rw-r--r-- | source4/build/smb_build/input.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 8f0509692c..72e978dfc5 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -10,7 +10,7 @@ use strict; package input; -my $subsystem_output_type = "OBJLIST"; +my $subsystem_default_output_type = "OBJLIST"; my $srcdir = "."; sub strtrim($) @@ -55,7 +55,9 @@ sub check_subsystem($$) } unless(defined($subsys->{OUTPUT_TYPE})) { - $subsys->{OUTPUT_TYPE} = $subsystem_output_type; + $subsys->{OUTPUT_TYPE} = $subsystem_default_output_type; + } else { + $subsys->{OUTPUT_TYPE} = join('', @{$subsys->{OUTPUT_TYPE}}); } } @@ -97,7 +99,7 @@ sub check_module($$) $mod->{ENABLE} = "YES"; push (@{$CTX->{INPUT}{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME}); printf("Module: %s...static\n",$mod->{NAME}); - $mod->{OUTPUT_TYPE} = $subsystem_output_type; + $mod->{OUTPUT_TYPE} = $subsystem_default_output_type; } else { $mod->{ENABLE} = "NO"; printf("Module: %s...not\n",$mod->{NAME}); @@ -169,7 +171,7 @@ sub check($) { my $CTX = shift; - ($subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}) if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})); + ($subsystem_default_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}) if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})); foreach my $part (values %{$CTX->{INPUT}}) { ($part->{ENABLE} = "YES") if not defined($part->{ENABLE}); |