svn commit: samba r15314 - in branches/SAMBA_4_0/source: lib/socket smb_server/smb smb_server/smb2

[jelmer@xxxxxxxxx]

Author: jelmer
Date: 2006-04-29 02:53:44 +0000 (Sat, 29 Apr 2006)
New Revision: 15314

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

Log:
Fix recursive dependency hack for static libs. Should fix the build 
on most systems.

Modified:
   branches/SAMBA_4_0/source/lib/socket/config.mk
   branches/SAMBA_4_0/source/smb_server/smb/config.mk
   branches/SAMBA_4_0/source/smb_server/smb2/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.mk      2006-04-29 02:45:34 UTC 
(rev 15313)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk      2006-04-29 02:53:44 UTC 
(rev 15314)
@@ -41,7 +41,7 @@
                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

Modified: branches/SAMBA_4_0/source/smb_server/smb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/config.mk  2006-04-29 02:45:34 UTC 
(rev 15313)
+++ branches/SAMBA_4_0/source/smb_server/smb/config.mk  2006-04-29 02:53:44 UTC 
(rev 15314)
@@ -16,6 +16,6 @@
                signing.o
 PUBLIC_DEPENDENCIES = \
                ntvfs LIBPACKET
-LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
+LDFLAGS = $(SUBSYSTEM_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB_PROTOCOL
 #######################

Modified: branches/SAMBA_4_0/source/smb_server/smb2/config.mk
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/config.mk 2006-04-29 02:45:34 UTC 
(rev 15313)
+++ branches/SAMBA_4_0/source/smb_server/smb2/config.mk 2006-04-29 02:53:44 UTC 
(rev 15314)
@@ -11,6 +11,6 @@
                keepalive.o
 PUBLIC_DEPENDENCIES = \
                ntvfs LIBPACKET LIBCLI_SMB2
-LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
+LDFLAGS = $(SUBSYSTEM_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB2_PROTOCOL
 #######################