Remove the MODULES_CLEAN variable. It's no longer necessary since

object files for modules are in .po files, while object files for
static use are in .o files. Pointed out by metze.

This reduces the number of files that have to be recompiled after the Makefile
changes. Preventing unnecessary recompiling of the other few is high
on my todo list.

diff --git a/source/Makefile.in b/source/Makefile.in
index 0851796c8ce320b9ffc0f79d4a74cbf227b9d21b..95a0968be0b9ed3d3cf1d145756ca2b9afc2c51d 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1226,7 +1226,7 @@ clean: delheaders python_clean
 # This is quite ugly actually.. But we need to make 
 # sure the changes to include/config.h are used.
 modules_clean:
-       @-rm -f @MODULES_CLEAN@ auth/auth.o passdb/pdb_interface.o smbd/server.o lib/iconv.o smbd/vfs.o sam/idmap.o
+       @-rm -f auth/auth.o passdb/pdb_interface.o smbd/server.o lib/iconv.o smbd/vfs.o sam/idmap.o
 
 # Making this target will just make sure that the prototype files
 # exist, not necessarily that they are up to date.  Since they're

diff --git a/source/aclocal.m4 b/source/aclocal.m4
index dd1ae8df72bcf205f966b8c1e1e2eb7d93abac3b..2661d5299fd12d4535f687d452e75d06c0579c60 100644 (file)
--- a/source/aclocal.m4
+++ b/source/aclocal.m4
@@ -64,7 +64,6 @@ AC_DEFUN(SMB_MODULE,
        else
                AC_MSG_RESULT([not])
        fi
-       MODULES_CLEAN="$MODULES_CLEAN $2 $3"
 ])
 
 AC_DEFUN(SMB_SUBSYSTEM,

diff --git a/source/configure.in b/source/configure.in
index 0578baa22f1a046a235741826405e2d04ecef12d..186c3ea090218f6353dabdb3b6d00f9664cf989b 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -2461,7 +2461,7 @@ AC_ARG_WITH(expsam,
       ;;
     nisplussam)
       ## pdb_nisplussam
-      MODULE_pdb_nisplussam=SHARED
+         default_shared_modules="$default_shared_modules pdb_nisplussam"
       ;;
     *)
       echo "Unknown module name \"$i\"!  Exiting..."
@@ -3890,8 +3890,6 @@ SMB_SUBSYSTEM(VFS)
 
 AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
 
-AC_SUBST(MODULES_CLEAN)
-
 #################################################
 # do extra things if we are running insure