diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 13:33:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 13:33:35 +0100 |
| commit | 1131d4c2545355ef793e468810655c0f72828368 (patch) | |
| tree | 6812d6bfd27835a9992e4addb98329da6c087d22 /source4/build/smb_build/main.pl | |
| parent | 94c937ffb0109effa55117c525db941194893091 (diff) | |
| parent | 5e336bea1c68fafa97f67abf89c678d3cd7250b8 (diff) | |
| download | samba-1131d4c2545355ef793e468810655c0f72828368.tar.gz samba-1131d4c2545355ef793e468810655c0f72828368.tar.bz2 samba-1131d4c2545355ef793e468810655c0f72828368.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit 4d190270463f8db475c152f5502c9de01765d904)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 0717cd9b0b..3911a11773 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -19,8 +19,8 @@ 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"]; -$subsys_output_type = ["STATIC_LIBRARY"]; +$subsys_output_type = ["MERGED_OBJ"]; +#$subsys_output_type = ["STATIC_LIBRARY"]; my $library_output_type; if ($config::config{USESHARED} eq "true") { |