svn commit: samba r11300 - in branches/SAMBA_4_0/source:
build/smb_build lib/ldb lib/registry lib/talloc lib/tdb
jelmer at samba.org
jelmer at samba.org
Wed Oct 26 13:19:15 GMT 2005
Author: jelmer
Date: 2005-10-26 13:19:15 +0000 (Wed, 26 Oct 2005)
New Revision: 11300
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11300
Log:
Treat libraries as a special kind of subsystem
(one that can also be built as a library and installed).
Modified:
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/build/smb_build/main.pl
branches/SAMBA_4_0/source/lib/ldb/config.mk
branches/SAMBA_4_0/source/lib/registry/config.mk
branches/SAMBA_4_0/source/lib/talloc/config.mk
branches/SAMBA_4_0/source/lib/tdb/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-10-26 13:19:15 UTC (rev 11300)
@@ -65,7 +65,8 @@
"MAJOR_VERSION" => "string",
"MINOR_VERSION" => "string",
"RELEASE_VERSION" => "string",
-
+ "INIT_OBJ_FILES" => "list",
+ "ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list",
"REQUIRED_SUBSYSTEMS" => "list",
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2005-10-26 13:19:15 UTC (rev 11300)
@@ -161,10 +161,7 @@
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");
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl 2005-10-26 13:19:15 UTC (rev 11300)
@@ -28,12 +28,12 @@
}
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);
Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk 2005-10-26 13:19:15 UTC (rev 11300)
@@ -77,7 +77,10 @@
################################################
# 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 = \
@@ -100,18 +103,6 @@
################################################
################################################
-# 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]
OBJ_FILES = \
Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/config.mk 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk 2005-10-26 13:19:15 UTC (rev 11300)
@@ -78,7 +78,10 @@
################################################
# 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 = \
@@ -91,18 +94,6 @@
################################################
################################################
-# 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]
INSTALLDIR = BINDIR
Modified: branches/SAMBA_4_0/source/lib/talloc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/config.mk 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/lib/talloc/config.mk 2005-10-26 13:19:15 UTC (rev 11300)
@@ -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
################################################
Modified: branches/SAMBA_4_0/source/lib/tdb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/config.mk 2005-10-26 13:05:29 UTC (rev 11299)
+++ branches/SAMBA_4_0/source/lib/tdb/config.mk 2005-10-26 13:19:15 UTC (rev 11300)
@@ -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 \
@@ -14,18 +17,6 @@
################################################
################################################
-# 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]
INSTALLDIR = BINDIR
More information about the samba-cvs
mailing list