r3744: Support building subsystems as a shared library. Modules don't work yet,

so while this does compile, it does not work yet.

diff --git a/source/auth/config.mk b/source/auth/config.mk
index cf794e30a95eddf42947ea27c3324e1340f8f6ff..b84880bccad8d666173fe8fbc23991429fc452cd 100644 (file)
--- a/source/auth/config.mk
+++ b/source/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/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 228c1d7e9b7293c990bbb9697de7f03ad334a599..bdeb6d02df6e48a188553a39316c2a7e848b8078 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/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/source/build/smb_build/output.pm b/source/build/smb_build/output.pm
index d0e00c75657775569d103075519e129d09caaf04..f04c544910c5dc20289d0d54cdfd1cfa178db2bf 100644 (file)
--- a/source/build/smb_build/output.pm
+++ b/source/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/source/build/smb_build/smb_build_h.pm b/source/build/smb_build/smb_build_h.pm
index 6d67eedf60c9a91940f3fcdd2e67b07ae2af65b5..f3b0a2b837f412c833e34a6d9524a4f8fadd5b19 100644 (file)
--- a/source/build/smb_build/smb_build_h.pm
+++ b/source/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/source/client/config.mk b/source/client/config.mk
index 6a26a5d324fbb644ce937ce15aafc34f1d5e3a8a..5be1c9f20bf8a4a711287a6ad7ca72721e4bf8a0 100644 (file)
--- a/source/client/config.mk
+++ b/source/client/config.mk
@@ -10,6 +10,7 @@ REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
                LIBBASIC \
-               LIBSMB
+               LIBSMB \
+               LIBRPC
 # End BINARY smbclient
 #################################

diff --git a/source/lib/dcom/config.mk b/source/lib/dcom/config.mk
index 21d90024d4e8d753c0084c96b89137470bd53dca..f0b4031fc1c6b7cbec5677a0c53219f0faecd281 100644 (file)
--- a/source/lib/dcom/config.mk
+++ b/source/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/source/libcli/libsmb.mk b/source/libcli/libsmb.mk
index ddc4eac35aea39bd4c20368ca36ec34a8fa68640..5f314dfca161bb8fefb018f6585ad8d67ec2b4a3 100644 (file)
--- a/source/libcli/libsmb.mk
+++ b/source/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/source/libnet/config.mk b/source/libnet/config.mk
index 36d369117d076cd9c09355fb6ad2f89900c1d0c6..b2c0c04387660e9e4458bc99598fe11f661b7711 100644 (file)
--- a/source/libnet/config.mk
+++ b/source/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/source/torture/config.mk b/source/torture/config.mk
index d57bbd8e8eb5dbbfdd92fadd105e20be1bdb373e..bd006ebb57a09608d73032998d090f05e23fd178 100644 (file)
--- a/source/torture/config.mk
+++ b/source/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/source/utils/config.mk b/source/utils/config.mk
index 6afb1c23c052426c9d3900c153a5e61a61f89fff..1e901e1d87782236d66be5b30234cd6e4f162825 100644 (file)
--- a/source/utils/config.mk
+++ b/source/utils/config.mk
@@ -9,7 +9,8 @@ REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
                LIBBASIC \
-               LIBSMB
+               LIBSMB \
+               LIBRPC
 # End BINARY ndrdump
 #################################