r15314: Fix recursive dependency hack for static libs. Should fix the build

on most systems.

diff --git a/source/lib/socket/config.mk b/source/lib/socket/config.mk
index 3862d4239e14e9d91c5a8884ffc8d0fd70105809..ee630fb227c021394e4ecfb7d29a9ad1715e955a 100644 (file)
--- 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 b8dc023c39a526eebfcb0a4323e7e003a3c4d8b4..05ff69316dd20982f6c7c1883610e0b5effa7ef9 100644 (file)
--- 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 ad8f9829d72230b378579bf8d592978e001c0385..d7401f19d0bc09b2ed5809dd7ba53dde119abc9d 100644 (file)
--- 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
 #######################