From dde593e19074b3f6a2eddc6ea64f9b0c54aee0ed Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 26 Jun 2003 17:33:58 +0000 Subject: 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. (This used to be commit b9b46d43c7c39d6738c254c4a148bdb93cae02e3) --- source3/Makefile.in | 2 +- source3/aclocal.m4 | 1 - source3/configure.in | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 0851796c8c..95a0968be0 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/aclocal.m4 b/source3/aclocal.m4 index dd1ae8df72..2661d5299f 100644 --- a/source3/aclocal.m4 +++ b/source3/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/source3/configure.in b/source3/configure.in index 0578baa22f..186c3ea090 100644 --- a/source3/configure.in +++ b/source3/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 -- cgit