From 8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 14 Nov 2004 16:22:01 +0000 Subject: 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) --- source4/libcli/auth/config.m4 | 1 - source4/libcli/auth/gensec.m4 | 5 ----- source4/libcli/auth/gensec.mk | 3 +++ source4/libcli/ldap/config.m4 | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 source4/libcli/auth/config.m4 delete mode 100644 source4/libcli/ldap/config.m4 (limited to 'source4/libcli') diff --git a/source4/libcli/auth/config.m4 b/source4/libcli/auth/config.m4 deleted file mode 100644 index ae189d651e..0000000000 --- a/source4/libcli/auth/config.m4 +++ /dev/null @@ -1 +0,0 @@ -SMB_SUBSYSTEM_MK(LIBCLI_AUTH,libcli/auth/config.mk) diff --git a/source4/libcli/auth/gensec.m4 b/source4/libcli/auth/gensec.m4 index 1894e1c136..768a2fae57 100644 --- a/source4/libcli/auth/gensec.m4 +++ b/source4/libcli/auth/gensec.m4 @@ -2,8 +2,3 @@ if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then /* enable this when krb5 is fully working */ SMB_MODULE_DEFAULT(gensec_krb5, NOT) fi - -SMB_SUBSYSTEM_MK(GENSEC,libcli/auth/gensec.mk) -SMB_MODULE_MK(gensec_krb5, GENSEC, NOT, libcli/auth/gensec.mk) -SMB_MODULE_MK(gensec_ntlmssp, GENSEC, STATIC, libcli/auth/gensec.mk) -SMB_MODULE_MK(gensec_spnego, GENSEC, STATIC, libcli/auth/gensec.mk) diff --git a/source4/libcli/auth/gensec.mk b/source4/libcli/auth/gensec.mk index ac778ad5c8..b6332bd68b 100644 --- a/source4/libcli/auth/gensec.mk +++ b/source4/libcli/auth/gensec.mk @@ -11,6 +11,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start MODULE gensec_krb5 [MODULE::gensec_krb5] +SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_krb5_init INIT_OBJ_FILES = libcli/auth/gensec_krb5.o ADD_OBJ_FILES = \ @@ -25,6 +26,7 @@ REQUIRED_SUBSYSTEMS = GENSEC EXT_LIB_KRB5 ################################################ # Start MODULE gensec_spnego [MODULE::gensec_spnego] +SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_spnego_init INIT_OBJ_FILES = libcli/auth/spnego.o ADD_OBJ_FILES = \ @@ -36,6 +38,7 @@ REQUIRED_SUBSYSTEMS = GENSEC ################################################ # Start MODULE gensec_ntlmssp [MODULE::gensec_ntlmssp] +SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_ntlmssp_init INIT_OBJ_FILES = libcli/auth/gensec_ntlmssp.o ADD_OBJ_FILES = \ diff --git a/source4/libcli/ldap/config.m4 b/source4/libcli/ldap/config.m4 deleted file mode 100644 index 01f78279bf..0000000000 --- a/source4/libcli/ldap/config.m4 +++ /dev/null @@ -1 +0,0 @@ -SMB_SUBSYSTEM_MK(LIBCLI_LDAP,libcli/ldap/config.mk) -- cgit