diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-30 22:46:16 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:06 -0500 |
commit | aa9f67163cd2df2a815ef585edad1951343b82c8 (patch) | |
tree | 88058f98a5681563c745a9e3239469b61e11648f /source4/build/smb_build | |
parent | 5a26b2d72b63f0b3d8d4aa151044521fdf8c2064 (diff) | |
download | samba-aa9f67163cd2df2a815ef585edad1951343b82c8.tar.gz samba-aa9f67163cd2df2a815ef585edad1951343b82c8.tar.bz2 samba-aa9f67163cd2df2a815ef585edad1951343b82c8.zip |
r12620: Get rid of automatically generated lists of init functions of subsystems.
This allows Samba libraries to be used by other projects (and parts of
Samba to be built as shared libraries).
(This used to be commit 44f0aba715bfedc7e1ee3d07e9a101a91dbd84b3)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
-rw-r--r-- | source4/build/smb_build/smb_build_h.pm | 31 |
2 files changed, 0 insertions, 33 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 405298eef2..b7c4ff572a 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -20,7 +20,6 @@ my $section_types = { "LDFLAGS" => "list", }, "SUBSYSTEM" => { - "INIT_FUNCTION" => "string", "OBJ_FILES" => "list", "REQUIRED_SUBSYSTEMS" => "list", @@ -64,7 +63,6 @@ my $section_types = { "MINOR_VERSION" => "string", "RELEASE_VERSION" => "string", - "INIT_FUNCTION" => "string", "OBJ_FILES" => "list", "DESCRIPTION" => "string", diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm index 2bb9f35c53..52fe0da6da 100644 --- a/source4/build/smb_build/smb_build_h.pm +++ b/source4/build/smb_build/smb_build_h.pm @@ -24,39 +24,8 @@ sub _prepare_smb_build_h($) { my $depend = shift; my @defines = (); - my %declared = (); my $output = ""; - # - # loop over all binaries - # - foreach my $key (values %{$depend}) { - next if ($key->{TYPE} ne "BINARY"); - - my $NAME = $key->{NAME}; - my $DEFINE = (); - my $name = lc($NAME); - - # - # Static modules - # - $DEFINE->{COMMENT} = "BINARY $NAME INIT"; - $DEFINE->{KEY} = $name . "_init_subsystems"; - $DEFINE->{VAL} = "do { \\\n"; - foreach my $subkey (@{$key->{SUBSYSTEM_INIT_FUNCTIONS}}) { - next if defined($declared{$subkey}); - $output .= "NTSTATUS $subkey(void);\n"; - $declared{$subkey} = 1; - } - - foreach my $subkey (@{$key->{SUBSYSTEM_INIT_FUNCTIONS}}) { - $DEFINE->{VAL} .= "\t\tif (NT_STATUS_IS_ERR($subkey())) exit(1); \\\n"; - } - $DEFINE->{VAL} .= "\t} while(0)"; - - push(@defines,$DEFINE); - } - foreach my $key (values %{$depend}) { my $DEFINE = (); next if ($key->{TYPE} ne "LIBRARY" and $key->{TYPE} ne "SUBSYSTEM"); |