summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-29 02:53:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:09 -0500
commit0199eac20d76fb10e1e68cb76de7da62526509e8 (patch)
tree795896cee62b5e307373c244147b38d574bac77e
parent9220144604e0050cd823fd107c311bf9013cd5a5 (diff)
downloadsamba-0199eac20d76fb10e1e68cb76de7da62526509e8.tar.gz
samba-0199eac20d76fb10e1e68cb76de7da62526509e8.tar.bz2
samba-0199eac20d76fb10e1e68cb76de7da62526509e8.zip
r15314: Fix recursive dependency hack for static libs. Should fix the build
on most systems. (This used to be commit c0ab0f4ed49d88807d07b1504574ca35542e2943)
-rw-r--r--source4/lib/socket/config.mk2
-rw-r--r--source4/smb_server/smb/config.mk2
-rw-r--r--source4/smb_server/smb2/config.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 3862d4239e..ee630fb227 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/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/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index b8dc023c39..05ff69316d 100644
--- a/source4/smb_server/smb/config.mk
+++ b/source4/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/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index ad8f9829d7..d7401f19d0 100644
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/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
#######################