summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-26 13:19:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:15 -0500
commitbf300c868781fed3b0c0556b4e40608589ad1585 (patch)
treed5f0600aa723f7579672c8c990506c2b4080a7f1 /source4/build/smb_build
parent78696ddcb237012ad1468440362ca67baab125f6 (diff)
downloadsamba-bf300c868781fed3b0c0556b4e40608589ad1585.tar.gz
samba-bf300c868781fed3b0c0556b4e40608589ad1585.tar.bz2
samba-bf300c868781fed3b0c0556b4e40608589ad1585.zip
r11300: Treat libraries as a special kind of subsystem
(one that can also be built as a library and installed). (This used to be commit 98d1f9b1dc523ed88c5aa8d066030b33d74f62bf)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/config_mk.pm3
-rw-r--r--source4/build/smb_build/input.pm5
-rw-r--r--source4/build/smb_build/main.pl6
3 files changed, 6 insertions, 8 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index b26e70f88b..91195974a7 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -65,7 +65,8 @@ my $section_types = {
"MAJOR_VERSION" => "string",
"MINOR_VERSION" => "string",
"RELEASE_VERSION" => "string",
-
+ "INIT_OBJ_FILES" => "list",
+ "ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list",
"REQUIRED_SUBSYSTEMS" => "list",
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index dd56c5d9c8..f656e78f88 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -161,10 +161,7 @@ sub check($$)
foreach my $k (keys %$INPUT) {
my $part = $INPUT->{$k};
- if (not defined($part->{TYPE})) {
- print STDERR "$k does not have a type set.. Perhaps it's only mentioned in a .m4 but not in a .mk file?\n";
- next;
- }
+
check_subsystem($INPUT, $part) if ($part->{TYPE} eq "SUBSYSTEM");
check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE");
check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY");
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 3643c2d89a..35e29ecb0e 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -28,12 +28,12 @@ if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) {
}
if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) {
- $smb_build::input::subsystem_output_type = $ENV{LIBRARY_OUTPUT_TYPE};
+ $smb_build::input::library_output_type = $ENV{LIBRARY_OUTPUT_TYPE};
} elsif ($config::config{BLDSHARED} eq "true") {
# FIXME: This should really be SHARED_LIBRARY
- $smb_build::input::subsystem_output_type = "MERGEDOBJ";
+ $smb_build::input::library_output_type = "MERGEDOBJ";
} elsif ($config::config{BLDMERGED} eq "true") {
- $smb_build::input::subsystem_output_type = "MERGEDOBJ";
+ $smb_build::input::library_output_type = "MERGEDOBJ";
}
my $DEPEND = smb_build::input::check($INPUT, \%config::enabled);