diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 19:50:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:04 -0500 |
| commit | 620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 (patch) | |
| tree | 15a768135a197cdd7b3acd369c029ce9248e9012 /source4/lib/socket/config.mk | |
| parent | 710ea949886dd57c66dc6d397e0ea41c89736107 (diff) | |
| download | samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.gz samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.bz2 samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.zip | |
r15298: Fix the build using a few hacks in the build system.
Recursive dependencies are now forbidden (the build system
will bail out if there are any).
I've split up auth_sam.c into auth_sam.c and sam.c. Andrew,
please rename sam.c / move its contents to whatever/wherever you think suits
best.
(This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0)
Diffstat (limited to 'source4/lib/socket/config.mk')
| -rw-r--r-- | source4/lib/socket/config.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index 25838c58cc..bbac1ff6d1 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -3,7 +3,7 @@ # Start MODULE socket_ipv4 [MODULE::socket_ipv4] SUBSYSTEM = SOCKET -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv4.o PUBLIC_DEPENDENCIES = EXT_SOCKET @@ -15,7 +15,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS # Start MODULE socket_ipv6 [MODULE::socket_ipv6] SUBSYSTEM = SOCKET -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv6.o PUBLIC_DEPENDENCIES = EXT_SOCKET @@ -26,7 +26,7 @@ PUBLIC_DEPENDENCIES = EXT_SOCKET # Start MODULE socket_unix [MODULE::socket_unix] SUBSYSTEM = SOCKET -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_unix.o PUBLIC_DEPENDENCIES = EXT_SOCKET @@ -42,6 +42,7 @@ OBJ_FILES = \ connect_multi.o \ connect.o PUBLIC_DEPENDENCIES = LIBTALLOC -PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE +PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE +#LIBCLI_RESOLVE # End SUBSYSTEM SOCKET ################################################ |