Makefile.in cleanups:

lib/util_smbd.c is not used anymore

reorder the SMB_MODULE() parameters the goal is to autogenerate the
make rules for shared modules:

dnl SMB_MODULE(1:name,2:subsystem,3:default_build,
		4:object_files,5:shared_object,6:libs
		7:whatif-static,8:whatif-shared,9:whatif-not)

and generate <SUBSYSTEM>_LIBS and MODULE_<name>_LIBS with the SMB_MODULE() macro

metze
(This used to be commit 904ce91ed9e3b26d591278984ae32fa99bac01fd)

4 files changed, 34 insertions, 33 deletions

diff --git a/source4/Makefile.in b/source4/Makefile.in
index 1580814920..2ad5992ec6 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -119,8 +119,6 @@ LIB_OBJ = lib/version.o lib/charcnv.o lib/debug.o lib/fault.o \
 	  lib/module.o \
 	  lib/ldap_escape.o lib/events.o lib/mutex.o
 
-LIB_SMBD_OBJ = lib/util_smbd.o $(LIB_OBJ)
-
 READLINE_OBJ = lib/readline.o
 
 POPT_LIB_OBJ = lib/popt_common.o 
@@ -129,15 +127,14 @@ PARAM_OBJ = param/loadparm.o param/params.o dynconfig.o
 
 SECRETS_OBJ = passdb/secrets.o
 
-LIBNMB_OBJ = libcli/unexpected.o libcli/namecache.o libcli/nmblib.o \
-	     libcli/namequery.o 
-
-LIBSAMBA_OBJ = libcli/util/nterr.o libcli/util/smbdes.o libcli/util/smbencrypt.o
+LIBNMB_OBJ =	libcli/unexpected.o libcli/namecache.o libcli/nmblib.o \
+		libcli/namequery.o 
 
 LIBCLIUTIL_OBJ = libcli/util/asn1.o \
-	     libcli/util/smberr.o \
-	     libcli/util/doserr.o libcli/util/errormap.o \
-	     libcli/util/pwd_cache.o libcli/util/clierror.o libcli/util/cliutil.o
+		libcli/util/smberr.o \
+		libcli/util/doserr.o libcli/util/errormap.o \
+		libcli/util/pwd_cache.o libcli/util/clierror.o libcli/util/cliutil.o \
+		libcli/util/nterr.o libcli/util/smbdes.o libcli/util/smbencrypt.o
 
 LIBRAW_NDR_OBJ = librpc/ndr/ndr.o librpc/ndr/ndr_basic.o librpc/ndr/ndr_sec.o \
 		librpc/ndr/ndr_spoolss_buf.o \
@@ -174,7 +171,7 @@ LIBRAW_OBJ = libcli/raw/rawfile.o libcli/raw/smb_signing.o  \
 	     libcli/raw/rawnegotiate.o libcli/raw/rawfsinfo.o \
 	     libcli/raw/rawfileinfo.o libcli/raw/rawnotify.o \
 	     libcli/raw/rawioctl.o libcli/raw/rawacl.o \
-	     $(LIBRAW_NDR_OBJ) $(LIBRAW_RPC_OBJ) $(LIBSAMBA_OBJ) $(LIBCLIUTIL_OBJ) \
+	     $(LIBRAW_NDR_OBJ) $(LIBRAW_RPC_OBJ) $(LIBCLIUTIL_OBJ) \
 	     $(LIBNMB_OBJ) $(LIBCLIAUTH_OBJ) 
 
 LIBSMB_OBJ = libcli/clireadwrite.o libcli/cliconnect.o \
@@ -232,7 +229,7 @@ PROCESS_MODEL_OBJ = smbd/process.o smbd/process_model.o smbd/process_standard.o
 
 SMBD_OBJ_BASE = $(PROCESS_MODEL_OBJ) $(SMBD_OBJ_SRV) \
 		$(PARAM_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ)  \
-		$(AUTH_OBJ) $(LIB_SMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_OBJ)
+		$(AUTH_OBJ) $(LIB_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_OBJ)
 
 SMBD_OBJ = $(SMBD_OBJ_MAIN) $(SMBD_OBJ_BASE)
 
@@ -283,7 +280,7 @@ PROTO_OBJ = $(SMBD_OBJ_SRV) \
 	    $(AUTH_OBJ) $(PARAM_OBJ) $(SECRETS_OBJ) \
 	    $(PASSDB_OBJ) \
 	    $(READLINE_OBJ) $(CLIENT_OBJ1) \
-	    $(LIB_SMBD_OBJ) $(POPT_LIB_OBJ) \
+	    $(LIB_OBJ) $(POPT_LIB_OBJ) \
 
 POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
           popt/popthelp.o popt/poptparse.o
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 21275fea61..fc71845d01 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -37,7 +37,7 @@ fi
 ])
 
 dnl Specify the default build method of this module 
-dnl SMB_MODULE_DEFAULT(name,default_build)
+dnl SMB_MODULE_DEFAULT(1:name,2:default_build)
 AC_DEFUN(SMB_MODULE_DEFAULT,
 [
 	dnl Fall back to static if dlopen() is not available
@@ -49,12 +49,12 @@ AC_DEFUN(SMB_MODULE_DEFAULT,
 ])
 
 dnl Mark specified module as shared
-dnl SMB_MODULE(name,default_build,static_files,shared_files,subsystem,whatif-static,whatif-shared,whatif-not)
+dnl SMB_MODULE(1:name,2:subsystem,3:default_build,4:object_files,5:shared_object,6:libs,7:whatif-static,8:whatif-shared,9:whatif-not)
 AC_DEFUN(SMB_MODULE,
 [
 	AC_MSG_CHECKING([how to build $1])
 	if test -z "$[MODULE_DEFAULT_][$1]"; then
-		eval MODULE_DEFAULT_$1=$2
+		eval MODULE_DEFAULT_$1=$3
 
 		if test x"MODULE_DEFAULT_$1" = xSHARED -a x"$ac_cv_func_dlopen" != xyes; then
 			eval MODULE_DEFAULT_$1=STATIC
@@ -63,38 +63,42 @@ AC_DEFUN(SMB_MODULE,
 
 	if test "$[MODULE_][$1]"; then
 		DEST=$[MODULE_][$1]
-	elif test "$[MODULE_]translit([$5], [A-Z], [a-z])" -a "$[MODULE_DEFAULT_][$1]"; then
-		DEST=$[MODULE_]translit([$5], [A-Z], [a-z])
+	elif test "$[MODULE_]translit([$2], [A-Z], [a-z])" -a "$[MODULE_DEFAULT_][$1]"; then
+		DEST=$[MODULE_]translit([$2], [A-Z], [a-z])
 	else
 		DEST=$[MODULE_DEFAULT_][$1]
 	fi
 	
 	if test x"$DEST" = xSHARED; then
 		AC_DEFINE([$1][_init], [init_module], [Whether to build $1 as shared module])
-		$5_MODULES="$$5_MODULES $4"
+		$2_MODULES="$$2_MODULES $5"
+		[MODULE_][$1][_LIBS]="$6"
 		AC_MSG_RESULT([shared])
-		[$7]
+		[$8]
 		string_shared_modules="$string_shared_modules $1"
 	elif test x"$DEST" = xSTATIC; then
-		[init_static_modules_]translit([$5], [A-Z], [a-z])="$[init_static_modules_]translit([$5], [A-Z], [a-z]) $1_init();"
+		[init_static_modules_]translit([$2], [A-Z], [a-z])="$[init_static_modules_]translit([$2], [A-Z], [a-z]) $1_init();"
 		string_static_modules="$string_static_modules $1"
-		$5_STATIC="$$5_STATIC $3"
-		AC_SUBST($5_STATIC)
-		[$6]
+		$2_STATIC="$$2_STATIC $4"
+		$2_LIBS="$$2_LIBS $6"
+		[$7]
 		AC_MSG_RESULT([static])
 	else
 	    	string_ignored_modules="$string_ignored_modules $1"
-	    	[$8]
+	    	[$9]
 		AC_MSG_RESULT([not])
 	fi
 ])
 
+dnl Mark specified module as shared
+dnl SMB_SUBSYSTEM(1:name,2:init_objectfile)
 AC_DEFUN(SMB_SUBSYSTEM,
 [
 	AC_SUBST($1_STATIC)
+	AC_SUBST($1_LIBS)
 	AC_SUBST($1_MODULES)
 	AC_DEFINE_UNQUOTED([static_init_]translit([$1], [A-Z], [a-z]), [{$init_static_modules_]translit([$1], [A-Z], [a-z])[}], [Static init functions])
-    	ifelse([$2], , :, [rm -f $2])
+	ifelse([$2], , :, [rm -f $2])
 ])
 
 dnl AC_PROG_CC_FLAG(flag)
diff --git a/source4/ntvfs/config.m4 b/source4/ntvfs/config.m4
index b9d79e61de..c7d4f59c1f 100644
--- a/source4/ntvfs/config.m4
+++ b/source4/ntvfs/config.m4
@@ -1,9 +1,9 @@
 dnl # NTVFS Server subsystem
 
-SMB_MODULE(ntvfs_cifs, STATIC, \$(NTVFS_CIFS_OBJ), "bin/cifs.$SHLIBEXT$", NTVFS)
-SMB_MODULE(ntvfs_simple, STATIC, \$(NTVFS_SIMPLE_OBJ), "bin/ntvfs_simple.$SHLIBEXT$", NTVFS)
-SMB_MODULE(ntvfs_print, STATIC, \$(NTVFS_PRINT_OBJ), "bin/ntvfs_print.$SHLIBEXT$", NTVFS)
-SMB_MODULE(ntvfs_ipc, STATIC, \$(NTVFS_IPC_OBJ), "bin/ntvfs_ipc.$SHLIBEXT$", NTVFS)
-SMB_MODULE(ntvfs_posix, NOT, \$(NTVFS_POSIX_OBJ), "bin/ntvfs_posix.$SHLIBEXT$", NTVFS)
+SMB_MODULE(ntvfs_cifs, NTVFS, STATIC, \$(NTVFS_CIFS_OBJ), "bin/cifs.$SHLIBEXT$")
+SMB_MODULE(ntvfs_simple, NTVFS, STATIC, \$(NTVFS_SIMPLE_OBJ), "bin/ntvfs_simple.$SHLIBEXT$")
+SMB_MODULE(ntvfs_print, NTVFS, STATIC, \$(NTVFS_PRINT_OBJ), "bin/ntvfs_print.$SHLIBEXT$")
+SMB_MODULE(ntvfs_ipc, NTVFS, STATIC, \$(NTVFS_IPC_OBJ), "bin/ntvfs_ipc.$SHLIBEXT$")
+SMB_MODULE(ntvfs_posix, NTVFS, NOT, \$(NTVFS_POSIX_OBJ), "bin/ntvfs_posix.$SHLIBEXT$")
 
 SMB_SUBSYSTEM(NTVFS,ntvfs/ntvfs_base.o)
diff --git a/source4/rpc_server/config.m4 b/source4/rpc_server/config.m4
index 570a5f7581..7396d19546 100644
--- a/source4/rpc_server/config.m4
+++ b/source4/rpc_server/config.m4
@@ -1,7 +1,7 @@
 dnl # DCERPC Server subsystem
 
-SMB_MODULE(dcerpc_rpcecho, STATIC, \$(DCERPC_RPCECHO_OBJ), "bin/dcerpc_rpcecho.$SHLIBEXT$", DCERPC)
-SMB_MODULE(dcerpc_epmapper, STATIC, \$(DCERPC_EPMAPPER_OBJ), "bin/dcerpc_epmapper.$SHLIBEXT$", DCERPC)
-SMB_MODULE(dcerpc_remote, STATIC, \$(DCERPC_REMOTE_OBJ), "bin/dcerpc_remote.$SHLIBEXT$", DCERPC)
+SMB_MODULE(dcerpc_rpcecho, DCERPC, STATIC, \$(DCERPC_RPCECHO_OBJ), "bin/dcerpc_rpcecho.$SHLIBEXT$")
+SMB_MODULE(dcerpc_epmapper, DCERPC, STATIC, \$(DCERPC_EPMAPPER_OBJ), "bin/dcerpc_epmapper.$SHLIBEXT$")
+SMB_MODULE(dcerpc_remote, DCERPC, STATIC, \$(DCERPC_REMOTE_OBJ), "bin/dcerpc_remote.$SHLIBEXT$")
 
 SMB_SUBSYSTEM(DCERPC,rpc_server/dcerpc_server.o)