sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

r11300: Treat libraries as a special kind of subsystem

Browse Source 
(one that can also be built as a library and installed).
(This used to be commit 98d1f9b1dc523ed88c5aa8d066030b33d74f62bf)
This commit is contained in:
Jelmer Vernooij 2005-10-26 13:19:15 +00:00 committed by Gerald (Jerry) Carter
parent 78696ddcb2
commit bf300c8687
7 changed files with 23 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/build/smb_build/config_mk.pm
View File

@ -65,7 +65,8 @@ my $section_types = {
"MAJOR_VERSION" => "string", "MAJOR_VERSION" => "string",
"MINOR_VERSION" => "string", "MINOR_VERSION" => "string",
"RELEASE_VERSION" => "string", "RELEASE_VERSION" => "string",
"INIT_OBJ_FILES" => "list",
"ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list", "OBJ_FILES" => "list",
"REQUIRED_SUBSYSTEMS" => "list", "REQUIRED_SUBSYSTEMS" => "list",

5
source4/build/smb_build/input.pm
View File

@ -161,10 +161,7 @@ sub check($$)
foreach my $k (keys %$INPUT) { foreach my $k (keys %$INPUT) {
my $part = $INPUT->{$k}; 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_subsystem($INPUT, $part) if ($part->{TYPE} eq "SUBSYSTEM");
check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE"); check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE");
check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY"); check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY");

6
source4/build/smb_build/main.pl
View File

@ -28,12 +28,12 @@ if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) {
} }
if (defined($ENV{"LIBRARY_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") { } elsif ($config::config{BLDSHARED} eq "true") {
# FIXME: This should really be SHARED_LIBRARY # 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") { } 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); my $DEPEND = smb_build::input::check($INPUT, \%config::enabled);

17
source4/lib/ldb/config.mk
View File

@ -77,7 +77,10 @@ NOPROTO = YES
################################################ ################################################
# Start SUBSYSTEM LIBLDB # Start SUBSYSTEM LIBLDB
[SUBSYSTEM::LIBLDB] [LIBRARY::LIBLDB]
MAJOR_VERSION = 0
MINOR_VERSION = 0
RELEASE_VERSION = 1
INIT_OBJ_FILES = \ INIT_OBJ_FILES = \
common/ldb.o common/ldb.o
ADD_OBJ_FILES = \ ADD_OBJ_FILES = \
@ -99,18 +102,6 @@ MANPAGE = man/ldb.3
# End SUBSYSTEM LIBLDB # 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 # Start SUBSYSTEM LDBSAMBA
[SUBSYSTEM::LDBSAMBA] [SUBSYSTEM::LDBSAMBA]

17
source4/lib/registry/config.mk
View File

@ -78,7 +78,10 @@ REQUIRED_SUBSYSTEMS = \
################################################ ################################################
# Start SUBSYSTEM REGISTRY # Start SUBSYSTEM REGISTRY
[SUBSYSTEM::REGISTRY] [LIBRARY::REGISTRY]
MAJOR_VERSION = 0
MINOR_VERSION = 0
RELEASE_VERSION = 1
INIT_OBJ_FILES = \ INIT_OBJ_FILES = \
common/reg_interface.o common/reg_interface.o
ADD_OBJ_FILES = \ ADD_OBJ_FILES = \
@ -90,18 +93,6 @@ REQUIRED_SUBSYSTEMS = \
# End MODULE registry_ldb # 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 # Start BINARY regdiff
[BINARY::regdiff] [BINARY::regdiff]

17
source4/lib/talloc/config.mk
View File

@ -1,20 +1,13 @@
################################################ ################################################
# Start SUBSYSTEM LIBTALLOC # Start LIBRARY LIBTALLOC
[SUBSYSTEM::LIBTALLOC] [LIBRARY::LIBTALLOC]
MAJOR_VERSION = 0
MINOR_VERSION = 0
RELEASE_VERSION = 1
INIT_OBJ_FILES = talloc.o INIT_OBJ_FILES = talloc.o
REQUIRED_SUBSYSTEMS = LIBREPLACE REQUIRED_SUBSYSTEMS = LIBREPLACE
NOPROTO = YES NOPROTO = YES
MANPAGE = talloc.3 MANPAGE = talloc.3
# End SUBSYSTEM LIBTALLOC
################################################
################################################
# Start LIBRARY LIBTALLOC
[LIBRARY::libtalloc]
MAJOR_VERSION = 0
MINOR_VERSION = 0
RELEASE_VERSION = 1
REQUIRED_SUBSYSTEMS = LIBTALLOC
# #
# End LIBRARY LIBTALLOC # End LIBRARY LIBTALLOC
################################################ ################################################

17
source4/lib/tdb/config.mk
View File

@ -1,6 +1,9 @@
################################################ ################################################
# Start SUBSYSTEM LIBTDB # Start SUBSYSTEM LIBTDB
[SUBSYSTEM::LIBTDB] [LIBRARY::LIBTDB]
MAJOR_VERSION = 0
MINOR_VERSION = 0
RELEASE_VERSION = 1
INIT_OBJ_FILES = \ INIT_OBJ_FILES = \
common/tdb.o common/tdb.o
ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \ ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \
@ -13,18 +16,6 @@ REQUIRED_SUBSYSTEMS = \
# End SUBSYSTEM LIBLDB # 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 # Start BINARY tdbtool
[BINARY::tdbtool] [BINARY::tdbtool]