diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:59:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:59:02 +0100 |
| commit | 4e750552b789054f094c3dc42f091cebdc4f715e (patch) | |
| tree | 6231d9969f39482b5b9e74e7ee519a96cc989653 /source4/build/smb_build/main.pl | |
| parent | 85ac8dc17ad8cd01bb773383fd30261b9f357292 (diff) | |
| parent | e8cf95773df914e8d71dcc1ce713fe0cc723d946 (diff) | |
| download | samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.gz samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.bz2 samba-4e750552b789054f094c3dc42f091cebdc4f715e.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit d31987461984aebf8c6f2513e83c92757c0f83c7)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index c7a92b7ce1..0717cd9b0b 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -19,6 +19,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 = ["MERGED_OBJ"]; $subsys_output_type = ["STATIC_LIBRARY"]; my $library_output_type; @@ -53,6 +54,7 @@ foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); + $mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}}); if (defined($key->{PC_FILE})) { $mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n"); } |