diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 20:38:21 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 20:38:21 +0100 |
| commit | 8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f (patch) | |
| tree | d5be2d69e8ef051c8182093ebbe18f0ffca627b7 /source4/build/smb_build/main.pl | |
| parent | d803ff9e724cc91778c1b94a5b78ef935200adb8 (diff) | |
| download | samba-8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f.tar.gz samba-8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f.tar.bz2 samba-8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f.zip | |
Reintroduce mergedobj support.
(This used to be commit 1cf23c58411a9b8a9bb97016c27c10a218e73146)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index a85eab32de..4c09e32422 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -20,7 +20,7 @@ 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"]; +$subsys_output_type = ["MERGED_OBJ"]; my $library_output_type; if ($config::config{USESHARED} eq "true") { @@ -59,6 +59,7 @@ my $shared_libs_used = 0; foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; + $mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}}); $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if (defined($key->{PC_FILE})) { push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}"); |