diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-14 16:22:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:47 -0500 |
| commit | 8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 (patch) | |
| tree | 8e8ccaddb94efc6a85ab6c339cab76cea1f44085 /source4/lib/socket | |
| parent | 7367d23713a34a6c29a492adb365292399adffe8 (diff) | |
| download | samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.gz samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.bz2 samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.zip | |
r3733: More build system fixes/features:
- Use .mk files directly (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or BINARY). This allows addition of new modules and subsystems without running configure
- Add support for generating .dot files with the Samba4 dependency tree (as used by the graphviz and springgraph utilities)
(This used to be commit 64826da834e26ee0488674e27a0eae36491ee179)
Diffstat (limited to 'source4/lib/socket')
| -rw-r--r-- | source4/lib/socket/config.m4 | 6 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4 index 37eff7ded1..1140c139cb 100644 --- a/source4/lib/socket/config.m4 +++ b/source4/lib/socket/config.m4 @@ -1,7 +1,4 @@ -SMB_MODULE_MK(socket_ipv4,SOCKET,STATIC,lib/socket/config.mk) -SMB_MODULE_MK(socket_unix,SOCKET,STATIC,lib/socket/config.mk) - dnl test for ipv6 using the gethostbyname2() function. That should be sufficient dnl for now AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false) @@ -12,6 +9,3 @@ fi dnl don't build ipv6 by default, unless the above test enables it, or dnl the configure uses --with-static-modules=socket_ipv6 -SMB_MODULE_MK(socket_ipv6,SOCKET,NOT,lib/socket/config.mk) - -SMB_SUBSYSTEM_MK(SOCKET,lib/socket/config.mk) diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index 76e5895933..6217fbc079 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -2,6 +2,7 @@ ################################################ # Start MODULE socket_ipv4 [MODULE::socket_ipv4] +SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ lib/socket/socket_ipv4.o # End MODULE socket_ipv4 @@ -10,6 +11,7 @@ INIT_OBJ_FILES = \ ################################################ # Start MODULE socket_ipv6 [MODULE::socket_ipv6] +SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ lib/socket/socket_ipv6.o # End MODULE socket_ipv6 @@ -18,6 +20,7 @@ INIT_OBJ_FILES = \ ################################################ # Start MODULE socket_unix [MODULE::socket_unix] +SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ lib/socket/socket_unix.o # End MODULE socket_unix |