svn commit: samba r15338 - in branches/SAMBA_4_0/source: build/smb_build kdc libcli libcli/raw librpc torture utils

jelmer at samba.org jelmer at samba.org
Sun Apr 30 00:00:33 GMT 2006 

Author: jelmer
Date: 2006-04-30 00:00:28 +0000 (Sun, 30 Apr 2006)
New Revision: 15338

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15338

Log:
Fix build of most things with shared libs enabled.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/kdc/config.mk
   branches/SAMBA_4_0/source/libcli/config.mk
   branches/SAMBA_4_0/source/libcli/raw/clioplock.c
   branches/SAMBA_4_0/source/librpc/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/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-30 00:00:28 UTC (rev 15338)
@@ -3,7 +3,8 @@
 - include extra_flags.txt using Makefile construction if 
   supported by current make
 - make --enable-dso the default
- - fix module loading for selftest during non-developer builds
+- fix shared module loading for selftest during non-developer builds without install
+- remove recursive dependency between LIBSOCKET, LIBCLI_NBT and LIBCLI_RESOLVE
 - clearer distinction between dcerpc and ndr. seperate interface tables?
 - saner names for:
 	libcli.so.0.0.1 (rename to libsmb?)

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-04-30 00:00:28 UTC (rev 15338)
@@ -33,7 +33,7 @@
 	my $lib_name;
 
 	$lib->{DEPEND_LIST} = [];
-	push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)");
+	push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_FULL_OBJ_LIST)");
 
 	$link_name = lc($lib->{NAME});
 	$lib_name = $link_name;

Modified: branches/SAMBA_4_0/source/kdc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/kdc/config.mk	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/kdc/config.mk	2006-04-30 00:00:28 UTC (rev 15338)
@@ -16,7 +16,7 @@
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::HDB_LDB]
-CFLAGS = -Iheimdal/kdc
+CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
 OBJ_FILES = \
 		hdb-ldb.o \
 		pac-glue.o 

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/libcli/config.mk	2006-04-30 00:00:28 UTC (rev 15338)
@@ -42,10 +42,10 @@
 PRIVATE_PROTO_HEADER = nbt/nbtname.h
 OBJ_FILES = nbt/nbtname.o
 
-[LIBRARY::LIBCLI_NBT]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = NetBios over TCP/IP client library
+[SUBSYSTEM::LIBCLI_NBT]
+#VERSION = 0.0.1
+#SO_VERSION = 0
+#DESCRIPTION = NetBios over TCP/IP client library
 PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
 OBJ_FILES = \
 	nbt/nbtsocket.o \
@@ -142,6 +142,6 @@
 		raw/rawacl.o \
 		raw/rawdate.o \
 		raw/rawlpq.o
-PUBLIC_DEPENDENCIES = LIBPACKET gensec
+PUBLIC_DEPENDENCIES = LIBPACKET gensec LIBCRYPTO
 
 include smb2/config.mk

Modified: branches/SAMBA_4_0/source/libcli/raw/clioplock.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clioplock.c	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/libcli/raw/clioplock.c	2006-04-30 00:00:28 UTC (rev 15338)
@@ -24,7 +24,7 @@
 /****************************************************************************
 send an ack for an oplock break request
 ****************************************************************************/
-BOOL smbcli_oplock_ack(struct smbcli_tree *tree, uint16_t fnum, uint16_t ack_level)
+_PUBLIC_ BOOL smbcli_oplock_ack(struct smbcli_tree *tree, uint16_t fnum, uint16_t ack_level)
 {
 	BOOL ret;
 	struct smbcli_request *req;
@@ -53,7 +53,7 @@
 /****************************************************************************
 set the oplock handler for a connection
 ****************************************************************************/
-void smbcli_oplock_handler(struct smbcli_transport *transport, 
+_PUBLIC_ void smbcli_oplock_handler(struct smbcli_transport *transport, 
 			BOOL (*handler)(struct smbcli_transport *, uint16_t, uint16_t, uint8_t, void *),
 			void *private)
 {

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2006-04-30 00:00:28 UTC (rev 15338)
@@ -24,7 +24,7 @@
 PRIVATE_PROTO_HEADER = ndr/ndr_compression.h
 OBJ_FILES = \
 		ndr/ndr_compression.o
-PUBLIC_DEPENDENCIES = LIBCOMPRESSION
+PUBLIC_DEPENDENCIES = LIBCOMPRESSION LIBSAMBA-ERRORS
 # End SUBSYSTEM NDR_COMPRESSION
 ################################################
 

Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/torture/config.mk	2006-04-30 00:00:28 UTC (rev 15338)
@@ -274,7 +274,8 @@
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
-		LIBCLI_SMB
+		LIBCLI_SMB \
+		LIBCLI_RAW
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################

Modified: branches/SAMBA_4_0/source/utils/config.mk
===================================================================
--- branches/SAMBA_4_0/source/utils/config.mk	2006-04-29 23:41:12 UTC (rev 15337)
+++ branches/SAMBA_4_0/source/utils/config.mk	2006-04-30 00:00:28 UTC (rev 15338)
@@ -30,7 +30,8 @@
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
 		gensec \
-		LIBCLI_RESOLVE
+		LIBCLI_RESOLVE \
+		auth
 MANPAGE = man/ntlm_auth.1
 # End BINARY ntlm_auth
 #################################

More information about the samba-cvs mailing list