summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-14 22:23:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:48 -0500
commit31ded4901b4529ad2e49871502cab5ecba71483a (patch)
tree9ee5bf3ede7f672060e843c3c09cf5e9ad5f0fb4 /source4/build
parente856a8d83c18820a270ef865d2d7869849ce4e20 (diff)
downloadsamba-31ded4901b4529ad2e49871502cab5ecba71483a.tar.gz
samba-31ded4901b4529ad2e49871502cab5ecba71483a.tar.bz2
samba-31ded4901b4529ad2e49871502cab5ecba71483a.zip
r3737: - Get rid of the register_subsystem() and register_backend() functions.
- Re-disable tdbtool (it was building fine on my Debian box but other machines were having problems) (This used to be commit 0d7bb2c40b7a9ed59df3f8944133ea562697e814)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/pidl/proxy.pm2
-rw-r--r--source4/build/pidl/server.pm2
-rw-r--r--source4/build/smb_build/output.pm7
-rw-r--r--source4/build/smb_build/smb_build_h.pm28
4 files changed, 2 insertions, 37 deletions
diff --git a/source4/build/pidl/proxy.pm b/source4/build/pidl/proxy.pm
index b6d9733419..fabf7cc97e 100644
--- a/source4/build/pidl/proxy.pm
+++ b/source4/build/pidl/proxy.pm
@@ -66,7 +66,7 @@ sub ParseRegFunc($)
GUID_from_string(DCERPC_" . (uc $interface->{NAME}) . "_UUID, &iface.iid);
iface.proxy_vtable = talloc_memdup(NULL, &proxy, sizeof(struct dcom_$interface->{NAME}_vtable));
- return register_backend(\"dcom_interface\", &iface);
+ return dcom_register_interface(&iface);
}\n\n";
}
diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index 6a9ea157a9..2a838ccf48 100644
--- a/source4/build/pidl/server.pm
+++ b/source4/build/pidl/server.pm
@@ -190,7 +190,7 @@ NTSTATUS dcerpc_server_$name\_init(void)
ep_server.interface_by_name = $name\__op_interface_by_name;
/* register ourselves with the DCERPC subsystem. */
- ret = register_backend(\"dcerpc\", &ep_server);
+ ret = dcerpc_register_ep_server(&ep_server);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,(\"Failed to register \'$name\' endpoint server!\\n\"));
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 11e994407e..d0e00c7565 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -98,15 +98,8 @@ sub create_output($)
push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
- push(@{$part->{MODULE_INIT_FUNCTIONS}}, @{$elem->{INIT_FUNCTION}}) if
- $elem->{TYPE} eq "MODULE" and
- defined($elem->{INIT_FUNCTION}) and
- $elem->{INIT_FUNCTION} ne "" and
- $elem->{SUBSYSTEM} eq $part->{NAME};
-
push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, @{$elem->{INIT_FUNCTION}}) if
$part->{OUTPUT_TYPE} eq "BINARY" and
- $elem->{TYPE} eq "SUBSYSTEM" and
defined($elem->{INIT_FUNCTION}) and
$elem->{INIT_FUNCTION} ne "";
}
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index 0f1411dde1..f074f92199 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -28,34 +28,6 @@ sub _prepare_smb_build_h($)
my @defines = ();
#
- # loop over all subsystems
- #
- foreach my $key (values %{$depend}) {
- next if $key->{TYPE} ne "SUBSYSTEM";
-
- my $NAME = $key->{NAME};
- my $DEFINE = ();
- my $name = lc($NAME);
-
- #
- # Static modules
- #
- $DEFINE->{COMMENT} = "SUBSYSTEM $NAME INIT";
- $DEFINE->{KEY} = $name . "_init_static_modules";
- $DEFINE->{VAL} = "do { \\\n";
- foreach my $subkey (@{$key->{MODULE_INIT_FUNCTIONS}}) {
- $DEFINE->{VAL} .= "\t\textern NTSTATUS $subkey(void); \\\n";
- }
-
- foreach my $subkey (@{$key->{MODULE_INIT_FUNCTIONS}}) {
- $DEFINE->{VAL} .= "\t\t$subkey(); \\\n";
- }
- $DEFINE->{VAL} .= "\t} while(0)";
-
- push(@defines,$DEFINE);
- }
-
- #
# loop over all binaries
#
foreach my $key (values %{$depend}) {