diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 18:55:37 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 18:55:37 +0100 |
| commit | 6e0522c3cae9c99b589db67727ee1256c6da82ef (patch) | |
| tree | fd04b0a436f989f9c0e07ac021a6a95149a7b3d8 /source4/build/smb_build/main.pl | |
| parent | 5022db874b93f896f6e828f762f65a5d41619d61 (diff) | |
| download | samba-6e0522c3cae9c99b589db67727ee1256c6da82ef.tar.gz samba-6e0522c3cae9c99b589db67727ee1256c6da82ef.tar.bz2 samba-6e0522c3cae9c99b589db67727ee1256c6da82ef.zip | |
Build complete static libraries.
(This used to be commit 34e26f4eecdf5bca340133942b242969c4c16dff)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 375962bde9..3ed0327d6d 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -19,8 +19,7 @@ use strict; 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 = ["MERGED_OBJ"]; +my $subsys_output_type = ["MERGED_OBJ"]; my $library_output_type; if ($config::config{USESHARED} eq "true") { @@ -35,7 +34,7 @@ my $module_output_type; if ($config::config{USESHARED} eq "true") { $module_output_type = ["SHARED_LIBRARY"]; } else { - $module_output_type = ["INTEGRATED"]; + $module_output_type = ["MERGED_OBJ"]; } my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, @@ -43,9 +42,6 @@ my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, $library_output_type, $module_output_type); my $OUTPUT = output::create_output($DEPEND, \%config::config); -$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); my $shared_libs_used = 0; |