svn commit: samba r20825 - in
branches/SAMBA_4_0/source/build/smb_build: .
metze at samba.org
metze at samba.org
Tue Jan 16 09:48:40 GMT 2007
Author: metze
Date: 2007-01-16 09:48:39 +0000 (Tue, 16 Jan 2007)
New Revision: 20825
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20825
Log:
control the subsystem default output type via a variable too
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/main.pl
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl 2007-01-16 08:17:26 UTC (rev 20824)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl 2007-01-16 09:48:39 UTC (rev 20825)
@@ -19,6 +19,9 @@
my $INPUT = {};
my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
+my $subsys_output_type;
+$subsys_output_type = ["STATIC_LIBRARY"];
+
my $library_output_type;
if ($config::config{USESHARED} eq "true") {
$library_output_type = ["SHARED_LIBRARY", "STATIC_LIBRARY"];
@@ -35,10 +38,12 @@
$module_output_type = ["INTEGRATED"];
}
-my $DEPEND = smb_build::input::check($INPUT, \%config::enabled,
- ["STATIC_LIBRARY"], $library_output_type, $module_output_type);
+my $DEPEND = smb_build::input::check($INPUT, \%config::enabled,
+ $subsys_output_type,
+ $library_output_type,
+ $module_output_type);
my $OUTPUT = output::create_output($DEPEND, \%config::config);
-$config::config{SUBSYSTEM_OUTPUT_TYPE} = ["STATIC_LIBRARY"];
+$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsys_output_type;
$config::config{LIBRARY_OUTPUT_TYPE} = $library_output_type;
$config::config{MODULE_OUTPUT_TYPE} = $module_output_type;
my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
More information about the samba-cvs
mailing list