svn commit: samba r3744 - in branches/SAMBA_4_0/source: auth
build/smb_build client lib/dcom libcli libnet torture utils
jelmer at samba.org
jelmer at samba.org
Mon Nov 15 00:32:37 GMT 2004
Author: jelmer
Date: 2004-11-15 00:32:37 +0000 (Mon, 15 Nov 2004)
New Revision: 3744
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3744
Log:
Support building subsystems as a shared library. Modules don't work yet,
so while this does compile, it does not work yet.
Modified:
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/build/smb_build/output.pm
branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm
branches/SAMBA_4_0/source/client/config.mk
branches/SAMBA_4_0/source/lib/dcom/config.mk
branches/SAMBA_4_0/source/libcli/libsmb.mk
branches/SAMBA_4_0/source/libnet/config.mk
branches/SAMBA_4_0/source/torture/config.mk
branches/SAMBA_4_0/source/utils/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/auth/config.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -17,6 +17,7 @@
[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
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2004-11-15 00:32:37 UTC (rev 3744)
@@ -356,7 +356,7 @@
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 \$\@ \\
Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2004-11-15 00:32:37 UTC (rev 3744)
@@ -101,7 +101,8 @@
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";
}
}
Modified: branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm 2004-11-15 00:32:37 UTC (rev 3744)
@@ -64,7 +64,8 @@
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 = ();
Modified: branches/SAMBA_4_0/source/client/config.mk
===================================================================
--- branches/SAMBA_4_0/source/client/config.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/client/config.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -10,6 +10,7 @@
CONFIG \
LIBCMDLINE \
LIBBASIC \
- LIBSMB
+ LIBSMB \
+ LIBRPC
# End BINARY smbclient
#################################
Modified: branches/SAMBA_4_0/source/lib/dcom/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/dcom/config.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/lib/dcom/config.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -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
################################################
Modified: branches/SAMBA_4_0/source/libcli/libsmb.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/libsmb.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/libcli/libsmb.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -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 \
Modified: branches/SAMBA_4_0/source/libnet/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libnet/config.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/libnet/config.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -7,5 +7,6 @@
libnet/libnet_passwd.o \
libnet/libnet_time.o \
libnet/libnet_rpc.o
+REQUIRED_SUBSYSTEMS = LIBRPC
# End SUBSYSTEM LIBNET
#################################
Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/torture/config.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -20,7 +20,7 @@
torture/basic/delaywrite.o \
torture/basic/attr.o
REQUIRED_SUBSYSTEMS = \
- LIBSMB
+ LIBSMB LIBRPC
# End SUBSYSTEM TORTURE_BASIC
#################################
@@ -185,7 +185,8 @@
LIBSMB \
CONFIG \
LIBBASIC \
- LIBCMDLINE
+ LIBCMDLINE \
+ LIBRPC
# End BINARY gentest
#################################
@@ -198,7 +199,8 @@
LIBSMB \
CONFIG \
LIBBASIC \
- LIBCMDLINE
+ LIBCMDLINE \
+ LIBRPC
# End BINARY masktest
#################################
@@ -212,6 +214,7 @@
LIBSMB \
CONFIG \
LIBBASIC \
- LIBCMDLINE
+ LIBCMDLINE \
+ LIBRPC
# End BINARY locktest
#################################
Modified: branches/SAMBA_4_0/source/utils/config.mk
===================================================================
--- branches/SAMBA_4_0/source/utils/config.mk 2004-11-15 00:31:32 UTC (rev 3743)
+++ branches/SAMBA_4_0/source/utils/config.mk 2004-11-15 00:32:37 UTC (rev 3744)
@@ -9,7 +9,8 @@
CONFIG \
LIBCMDLINE \
LIBBASIC \
- LIBSMB
+ LIBSMB \
+ LIBRPC
# End BINARY ndrdump
#################################
More information about the samba-cvs
mailing list