From c0ab0f4ed49d88807d07b1504574ca35542e2943 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Apr 2006 02:53:44 +0000
Subject: [PATCH] r15314: Fix recursive dependency hack for static libs. Should
 fix the build on most systems.

---
 source/lib/socket/config.mk      | 2 +-
 source/smb_server/smb/config.mk  | 2 +-
 source/smb_server/smb2/config.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/lib/socket/config.mk b/source/lib/socket/config.mk
index 3862d4239e1..ee630fb227c 100644
--- a/source/lib/socket/config.mk
+++ b/source/lib/socket/config.mk
@@ -41,7 +41,7 @@ OBJ_FILES = \
 		access.o \
 		connect_multi.o \
 		connect.o
-LDFLAGS = $(LIBRARY_LIBCLI_RESOLVE_OUTPUT) $(LIBRARY_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(SUBSYSTEM_NDR_SVCCTL_OUTPUT)
+LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(LIBRARY_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(LIBRARY_NDR_SVCCTL_OUTPUT)
 PUBLIC_DEPENDENCIES = LIBTALLOC
 PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE 
 #LIBCLI_RESOLVE
diff --git a/source/smb_server/smb/config.mk b/source/smb_server/smb/config.mk
index b8dc023c39a..05ff69316dd 100644
--- a/source/smb_server/smb/config.mk
+++ b/source/smb_server/smb/config.mk
@@ -16,6 +16,6 @@ OBJ_FILES = \
 		signing.o
 PUBLIC_DEPENDENCIES = \
 		ntvfs LIBPACKET
-LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
+LDFLAGS = $(SUBSYSTEM_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB_PROTOCOL
 #######################
diff --git a/source/smb_server/smb2/config.mk b/source/smb_server/smb2/config.mk
index ad8f9829d72..d7401f19d0b 100644
--- a/source/smb_server/smb2/config.mk
+++ b/source/smb_server/smb2/config.mk
@@ -11,6 +11,6 @@ OBJ_FILES = \
 		keepalive.o
 PUBLIC_DEPENDENCIES = \
 		ntvfs LIBPACKET LIBCLI_SMB2
-LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
+LDFLAGS = $(SUBSYSTEM_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB2_PROTOCOL
 #######################