summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-15 00:32:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:50 -0500
commit34ddb33b4bf14587f4cd5d7972095df6ffa33e02 (patch)
tree9d36dabb726ad35b68560645a31b7db3acd2a950 /source4
parentc66dbe0c3e57eabacd28658891e356b724fd3fba (diff)
downloadsamba-34ddb33b4bf14587f4cd5d7972095df6ffa33e02.tar.gz
samba-34ddb33b4bf14587f4cd5d7972095df6ffa33e02.tar.bz2
samba-34ddb33b4bf14587f4cd5d7972095df6ffa33e02.zip
r3744: Support building subsystems as a shared library. Modules don't work yet,
so while this does compile, it does not work yet. (This used to be commit 3d885562c9f83d60c5d4957b067e35387dfa50dd)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/config.mk1
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/build/smb_build/output.pm3
-rw-r--r--source4/build/smb_build/smb_build_h.pm3
-rw-r--r--source4/client/config.mk3
-rw-r--r--source4/lib/dcom/config.mk2
-rw-r--r--source4/libcli/libsmb.mk2
-rw-r--r--source4/libnet/config.mk1
-rw-r--r--source4/torture/config.mk11
-rw-r--r--source4/utils/config.mk3
10 files changed, 20 insertions, 11 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index cf794e30a9..b84880bcca 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -17,6 +17,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::auth_builtin]
INIT_FUNCTION = auth_builtin_init
SUBSYSTEM = AUTH
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS
INIT_OBJ_FILES = \
auth/auth_builtin.o
# End MODULE auth_builtin
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 228c1d7e9b..bdeb6d02df 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -356,7 +356,7 @@ LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST =$tmpshlink
LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS =$tmpshflag
#
-# Shared $ctx->{LIBRARY_REALNAME}
+# Shared $ctx->{LIBRARY_NAME}
$ctx->{OUTPUT}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) bin/.dummy
\@echo Linking \$\@
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index d0e00c7565..f04c544910 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -101,7 +101,8 @@ sub create_output($)
push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, @{$elem->{INIT_FUNCTION}}) if
$part->{OUTPUT_TYPE} eq "BINARY" and
defined($elem->{INIT_FUNCTION}) and
- $elem->{INIT_FUNCTION} ne "";
+ $elem->{INIT_FUNCTION} ne "" and
+ $part->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
}
}
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index 6d67eedf60..f3b0a2b837 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -64,7 +64,8 @@ sub _prepare_smb_build_h($)
next if $key->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
my $name = $key->{NAME};
- my $func = $key->{INIT_FUNCTION};
+ next if not defined($key->{INIT_FUNCTION});
+ my $func = join(' ', @{$key->{INIT_FUNCTION}});
next if $func eq "";
my $DEFINE = ();
diff --git a/source4/client/config.mk b/source4/client/config.mk
index 6a26a5d324..5be1c9f20b 100644
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -10,6 +10,7 @@ REQUIRED_SUBSYSTEMS = \
CONFIG \
LIBCMDLINE \
LIBBASIC \
- LIBSMB
+ LIBSMB \
+ LIBRPC
# End BINARY smbclient
#################################
diff --git a/source4/lib/dcom/config.mk b/source4/lib/dcom/config.mk
index 21d90024d4..f0b4031fc1 100644
--- a/source4/lib/dcom/config.mk
+++ b/source4/lib/dcom/config.mk
@@ -4,7 +4,7 @@
INIT_OBJ_FILES = \
lib/dcom/common/main.o \
lib/dcom/common/tables.o
-REQUIRED_SUBSYSTEMS = LIBRPC
+REQUIRED_SUBSYSTEMS = LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW
#
# End SUBSYSTEM LIBDCOM
################################################
diff --git a/source4/libcli/libsmb.mk b/source4/libcli/libsmb.mk
index ddc4eac35a..5f314dfca1 100644
--- a/source4/libcli/libsmb.mk
+++ b/source4/libcli/libsmb.mk
@@ -1,5 +1,5 @@
[SUBSYSTEM::LIBSMB]
-REQUIRED_SUBSYSTEMS = LIBCLI LIBRPC SOCKET
+REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
ADD_OBJ_FILES = libcli/clireadwrite.o \
libcli/cliconnect.o \
libcli/clifile.o \
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 36d369117d..b2c0c04387 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -7,5 +7,6 @@ ADD_OBJ_FILES = \
libnet/libnet_passwd.o \
libnet/libnet_time.o \
libnet/libnet_rpc.o
+REQUIRED_SUBSYSTEMS = LIBRPC
# End SUBSYSTEM LIBNET
#################################
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index d57bbd8e8e..bd006ebb57 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -20,7 +20,7 @@ ADD_OBJ_FILES = \
torture/basic/delaywrite.o \
torture/basic/attr.o
REQUIRED_SUBSYSTEMS = \
- LIBSMB
+ LIBSMB LIBRPC
# End SUBSYSTEM TORTURE_BASIC
#################################
@@ -185,7 +185,8 @@ REQUIRED_SUBSYSTEMS = \
LIBSMB \
CONFIG \
LIBBASIC \
- LIBCMDLINE
+ LIBCMDLINE \
+ LIBRPC
# End BINARY gentest
#################################
@@ -198,7 +199,8 @@ REQUIRED_SUBSYSTEMS = \
LIBSMB \
CONFIG \
LIBBASIC \
- LIBCMDLINE
+ LIBCMDLINE \
+ LIBRPC
# End BINARY masktest
#################################
@@ -212,6 +214,7 @@ REQUIRED_SUBSYSTEMS = \
LIBSMB \
CONFIG \
LIBBASIC \
- LIBCMDLINE
+ LIBCMDLINE \
+ LIBRPC
# End BINARY locktest
#################################
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 6afb1c23c0..1e901e1d87 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -9,7 +9,8 @@ REQUIRED_SUBSYSTEMS = \
CONFIG \
LIBCMDLINE \
LIBBASIC \
- LIBSMB
+ LIBSMB \
+ LIBRPC
# End BINARY ndrdump
#################################