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)

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index b26e70f88b7b0781d2018e2636fb5830a5fcb6e8..91195974a7897f0c9ecc9126736bfe1da4f80037 100644 (file)
--- 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 dd56c5d9c8699992a3850222fc83e61ea58e154f..f656e78f880ba50bb42f869730f1f4b6f11d6de6 100644 (file)
--- 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 3643c2d89a2b17cff269915397f738e118a79778..35e29ecb0e609cf5b7b22a6ad50775a29d1ade0f 100644 (file)
--- 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);

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index b30ffc36c837c7da5377f8aadbb81f089d17c15b..6e948f20dff95aab1f2a8d24906db2aabfb16ba0 100644 (file)
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -77,7 +77,10 @@ NOPROTO = YES
 
 ################################################
 # Start SUBSYSTEM LIBLDB
-[SUBSYSTEM::LIBLDB]
+[LIBRARY::LIBLDB]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
                common/ldb.o
 ADD_OBJ_FILES = \
@@ -99,18 +102,6 @@ MANPAGE = man/ldb.3
 # End SUBSYSTEM LIBLDB
 ################################################
 
-################################################
-# Start LIBRARY LIBLDB
-[LIBRARY::libldb]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = \
-               LIBLDB
-#
-# End LIBRARY LIBLDB
-################################################
-
 ################################################
 # Start SUBSYSTEM LDBSAMBA
 [SUBSYSTEM::LDBSAMBA]

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 9461bb2a95d205a2f4561a7011ba1d9d91d5a026..288e3d21eec82e37209f481338227d4df4432b96 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -78,7 +78,10 @@ REQUIRED_SUBSYSTEMS = \
 
 ################################################
 # Start SUBSYSTEM REGISTRY
-[SUBSYSTEM::REGISTRY]
+[LIBRARY::REGISTRY]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
                common/reg_interface.o
 ADD_OBJ_FILES = \
@@ -90,18 +93,6 @@ REQUIRED_SUBSYSTEMS = \
 # End MODULE registry_ldb
 ################################################
 
-################################################
-# Start LIBRARY libwinregistry
-[LIBRARY::libwinregistry]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = \
-               REGISTRY
-#
-# End LIBRARY libwinregistry
-################################################
-
 ################################################
 # Start BINARY regdiff
 [BINARY::regdiff]

diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 1d5d957e9131b64cf4e8446a453f77542922e38e..5d88616b15ab9a6e1b1e652e870a7b7fe2090e10 100644 (file)
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,20 +1,13 @@
-################################################
-# Start SUBSYSTEM LIBTALLOC
-[SUBSYSTEM::LIBTALLOC]
-INIT_OBJ_FILES = talloc.o
-REQUIRED_SUBSYSTEMS = LIBREPLACE
-NOPROTO = YES
-MANPAGE = talloc.3
-# End SUBSYSTEM LIBTALLOC
-################################################
-
 ################################################
 # Start LIBRARY LIBTALLOC
-[LIBRARY::libtalloc]
+[LIBRARY::LIBTALLOC]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = LIBTALLOC
+INIT_OBJ_FILES = talloc.o
+REQUIRED_SUBSYSTEMS = LIBREPLACE
+NOPROTO = YES
+MANPAGE = talloc.3
 #
 # End LIBRARY LIBTALLOC
 ################################################

diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 6c97c01b246c98bc725211878fc36fb1e94350e6..b68a12119033fb67aa0ceb1cb07c66f9adf3bc55 100644 (file)
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -1,6 +1,9 @@
 ################################################
 # Start SUBSYSTEM LIBTDB
-[SUBSYSTEM::LIBTDB]
+[LIBRARY::LIBTDB]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
                common/tdb.o
 ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \
@@ -13,18 +16,6 @@ REQUIRED_SUBSYSTEMS = \
 # End SUBSYSTEM LIBLDB
 ################################################
 
-################################################
-# Start LIBRARY LIBTDB
-[LIBRARY::libtdb]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = \
-               LIBTDB
-#
-# End LIBRARY LIBLDB
-################################################
-
 ################################################
 # Start BINARY tdbtool
 [BINARY::tdbtool]