diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-28 21:13:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:29 -0500 |
| commit | a4e7bf3a89a986f0055bb8b6c6890449ca405f39 (patch) | |
| tree | 7749f209fd32079a26abb237a2908dd4c6c51baf /source4/build/smb_build/main.pl | |
| parent | 5a67b508d8f8761f0a73c2f7a116be1693d73395 (diff) | |
| download | samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.gz samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.bz2 samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.zip | |
r11382: Require number of required M4 macros
Make MODULE handling a bit more like BINARY, LIBRARY and SUBSYSTEM
Add some more PUBLIC_HEADERS
(This used to be commit 875eb8f4cc658e6aebab070029fd499a726ad520)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index a207062d34..1bc4d45aaa 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -37,6 +37,16 @@ if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { $smb_build::input::library_output_type = "MERGEDOBJ"; } +if (defined($ENV{"MODULE_OUTPUT_TYPE"})) { + $smb_build::input::module_output_type = $ENV{MODULE_OUTPUT_TYPE}; +} elsif ($config::config{BLDSHARED} eq "true") { + #FIXME: This should eventually become SHARED_LIBRARY + # rather then MERGEDOBJ once I'm certain it works ok -- jelmer + $smb_build::input::module_output_type = "MERGEDOBJ"; +} elsif ($config::config{BLDMERGED} eq "true") { + $smb_build::input::module_output_type = "MERGEDOBJ"; +} + my $DEPEND = smb_build::input::check($INPUT, \%config::enabled); my $OUTPUT = output::create_output($DEPEND); my $mkenv = new smb_build::makefile(\%config::config, $mkfile); |