diff options
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 3 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 5 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 6 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 17 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 17 | ||||
| -rw-r--r-- | source4/lib/talloc/config.mk | 17 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 17 |
7 files changed, 23 insertions, 59 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); diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index b30ffc36c8..6e948f20df 100644 --- 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 = \ @@ -100,18 +103,6 @@ MANPAGE = man/ldb.3 ################################################ ################################################ -# 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 = \ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 9461bb2a95..288e3d21ee 100644 --- 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 = \ @@ -91,18 +94,6 @@ REQUIRED_SUBSYSTEMS = \ ################################################ ################################################ -# 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 diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 1d5d957e91..5d88616b15 100644 --- 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 6c97c01b24..b68a121190 100644 --- 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 \ @@ -14,18 +17,6 @@ REQUIRED_SUBSYSTEMS = \ ################################################ ################################################ -# 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 |