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

(This used to be commit 8985093d3fba90287bd739aaaa0fbfdadca2b999)

8 files changed, 16 insertions, 13 deletions

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 148abd6eda..086f62b869 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -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?)
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 52a7f1b639..351dff521a 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -33,7 +33,7 @@ sub generate_shared_library($)
 	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;
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index e0361e337e..f83cc59bb2 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -16,7 +16,7 @@ PUBLIC_DEPENDENCIES = \
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::HDB_LDB]
-CFLAGS = -Iheimdal/kdc
+CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
 OBJ_FILES = \
 		hdb-ldb.o \
 		pac-glue.o 
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index e68bdf1f45..533266dca8 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -42,10 +42,10 @@ PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE
 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 @@ OBJ_FILES = raw/rawfile.o \
 		raw/rawacl.o \
 		raw/rawdate.o \
 		raw/rawlpq.o
-PUBLIC_DEPENDENCIES = LIBPACKET gensec
+PUBLIC_DEPENDENCIES = LIBPACKET gensec LIBCRYPTO
 
 include smb2/config.mk
diff --git a/source4/libcli/raw/clioplock.c b/source4/libcli/raw/clioplock.c
index f26aa0c5f2..f004532b26 100644
--- a/source4/libcli/raw/clioplock.c
+++ b/source4/libcli/raw/clioplock.c
@@ -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 @@ BOOL smbcli_oplock_ack(struct smbcli_tree *tree, uint16_t fnum, uint16_t ack_lev
 /****************************************************************************
 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)
 {
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index db74c12129..56d8a5b27c 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -24,7 +24,7 @@ DESCRIPTION = NDR support for compressed subcontexts
 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
 ################################################
 
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 384e7f3630..efbebc549b 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -274,7 +274,8 @@ PRIVATE_DEPENDENCIES = \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
-		LIBCLI_SMB
+		LIBCLI_SMB \
+		LIBCLI_RAW
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index cafa022d94..e2c853d72a 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -30,7 +30,8 @@ PRIVATE_DEPENDENCIES = \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
 		gensec \
-		LIBCLI_RESOLVE
+		LIBCLI_RESOLVE \
+		auth
 MANPAGE = man/ntlm_auth.1
 # End BINARY ntlm_auth
 #################################