diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 19:50:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:04 -0500 |
| commit | 620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 (patch) | |
| tree | 15a768135a197cdd7b3acd369c029ce9248e9012 /source4/build/smb_build/main.pl | |
| parent | 710ea949886dd57c66dc6d397e0ea41c89736107 (diff) | |
| download | samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.gz samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.bz2 samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.zip | |
r15298: Fix the build using a few hacks in the build system.
Recursive dependencies are now forbidden (the build system
will bail out if there are any).
I've split up auth_sam.c into auth_sam.c and sam.c. Andrew,
please rename sam.c / move its contents to whatever/wherever you think suits
best.
(This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 4f6787eaf8..ec4ad0995e 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -45,10 +45,8 @@ if (defined($ENV{"MODULE_OUTPUT_TYPE"})) { $module_output_type = $ENV{MODULE_OUTPUT_TYPE}; } elsif ($config::config{BLDSHARED} eq "true") { $module_output_type = "SHARED_LIBRARY"; -} elsif ($config::config{BLDMERGED} eq "true") { - $module_output_type = "MERGEDOBJ"; } else { - $module_output_type = "OBJ_LIST"; + $module_output_type = "INTEGRATED"; } my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, @@ -59,6 +57,13 @@ $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); + +foreach my $key (values %$OUTPUT) { + next unless defined $key->{OUTPUT_TYPE}; + + $mkenv->Integrated($key) if $key->{OUTPUT_TYPE} eq "INTEGRATED"; +} + foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; |