s3:Makefile.in: fix 'make clean' after moving generated files to autoconf/
[kai/samba.git] / source3 / Makefile.in
index 88872adb0a6238c09c8ab9dcffa4682823372107..42c573e0dd3c32d2164f79979a0034eac2d3289b 100644 (file)
@@ -109,10 +109,10 @@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 DNSSD_LIBS=@DNSSD_LIBS@
 AVAHI_LIBS=@AVAHI_LIBS@
 POPT_LIBS=@POPTLIBS@
-LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
+LIBTALLOC=@LIBTALLOC_STATIC@
 LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
 LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
-LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
+LIBTDB=@LIBTDB_STATIC@
 LIBTDB_LIBS=@LIBTDB_LIBS@
 TDB_DEPS=@TDB_DEPS@
 LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
@@ -153,7 +153,6 @@ PDBLIBDIR = $(MODULESDIR)/pdb
 RPCLIBDIR = $(MODULESDIR)/rpc
 IDMAPLIBDIR = $(MODULESDIR)/idmap
 NSSINFOLIBDIR = $(MODULESDIR)/nss_info
-CHARSETLIBDIR = $(MODULESDIR)/charset
 AUTHLIBDIR = $(MODULESDIR)/auth
 CONFIGLIBDIR = $(MODULESDIR)/config
 GPEXTLIBDIR = $(MODULESDIR)/gpext
@@ -172,7 +171,7 @@ FLAGS = -I. \
        -I$(srcdir)/lib \
        -I.. \
        -Iautoconf \
-       -Iautoconf/librpc \
+       -Iautoconf/source3 \
        -I./../lib/ldb/include \
        -D_SAMBA_BUILD_=3
 
@@ -242,12 +241,11 @@ VFS_MODULES = @VFS_MODULES@
 PERFCOUNT_MODULES = @PERFCOUNT_MODULES@
 PDB_MODULES = @PDB_MODULES@
 IDMAP_MODULES = @IDMAP_MODULES@
-CHARSET_MODULES = @CHARSET_MODULES@
 AUTH_MODULES = @AUTH_MODULES@
 NSS_INFO_MODULES = @NSS_INFO_MODULES@
 GPEXT_MODULES = @GPEXT_MODULES@
 MODULES = $(VFS_MODULES) $(PDB_MODULES) $(IDMAP_MODULES) \
-          $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES) \
+          $(AUTH_MODULES) $(NSS_INFO_MODULES) \
          $(GPEXT_MODULES) $(PERFCOUNT_MODULES)
 
 EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
@@ -382,6 +380,8 @@ LIBCLI_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon_c.o \
 
 LIBCLI_EPMAPPER_OBJ = autoconf/librpc/gen_ndr/ndr_epmapper_c.o
 
+LIBCLI_FSRVP_OBJ = autoconf/librpc/gen_ndr/ndr_fsrvp_c.o
+
 LIBNDR_GEN_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc.o \
                 $(LIBNDR_GEN_OBJ0) \
                 autoconf/librpc/gen_ndr/ndr_dfs.o \
@@ -395,7 +395,8 @@ LIBNDR_GEN_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc.o \
                 autoconf/librpc/gen_ndr/ndr_dssetup.o \
                 autoconf/librpc/gen_ndr/ndr_epmapper.o \
                 autoconf/librpc/gen_ndr/ndr_ntsvcs.o \
-                $(LIBNDR_SPOOLSS_OBJ)
+                $(LIBNDR_SPOOLSS_OBJ) \
+                autoconf/librpc/gen_ndr/ndr_fsrvp.o
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -476,7 +477,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          lib/server_contexts.o \
          lib/server_prefork.o \
          lib/server_prefork_util.o \
-         lib/ldap_escape.o @CHARSET_STATIC@ \
+         lib/ldap_escape.o \
          ../libcli/security/secdesc.o ../libcli/security/access_check.o \
          ../libcli/security/secace.o ../libcli/security/object_tree.o \
          ../libcli/security/sddl.o ../libcli/security/session.o \
@@ -905,7 +906,6 @@ AUTH_UNIX_OBJ = auth/auth_unix.o
 AUTH_WINBIND_OBJ = auth/auth_winbind.o
 AUTH_WBC_OBJ = auth/auth_wbc.o
 AUTH_SCRIPT_OBJ = auth/auth_script.o
-AUTH_NETLOGOND_OBJ = auth/auth_netlogond.o
 
 AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \
           auth/server_info.o \
@@ -1091,7 +1091,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
                 rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \
                 rpcclient/cmd_wkssvc.o rpcclient/cmd_ntsvcs.o \
                 rpcclient/cmd_drsuapi.o rpcclient/cmd_eventlog.o \
-                rpcclient/cmd_winreg.o \
+                rpcclient/cmd_winreg.o rpcclient/cmd_fss.o \
                 $(DISPLAY_SEC_OBJ)
 
 RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
@@ -1113,6 +1113,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
             $(LIBCLI_SAMR_OBJ) \
             $(LIBCLI_WINREG_OBJ) \
             $(LIBCLI_NETLOGON_OBJ) \
+            $(LIBCLI_FSRVP_OBJ) \
             $(RPC_CLIENT_SCHANNEL_OBJ) \
             rpc_client/init_netlogon.o \
             rpc_client/init_samr.o
@@ -1677,18 +1678,18 @@ idl_full::
        @PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES)
 
-mkparam: ../lib/param/param_local.h ../lib/param/param_global.h param/param_global.h ../lib/param/param_proto.h ../lib/param/s3_param.h
+mkparam: autoconf/lib/param/param_local.h autoconf/lib/param/param_global.h autoconf/source3/param/param_global.h autoconf/lib/param/param_proto.h autoconf/lib/param/s3_param.h
 
-../lib/param/param_local.h:
-        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL
-../lib/param/param_global.h:
-        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/loadparm.c --file ../lib/param/param_global.h --generate-scope=GLOBAL
-param/param_global.h:
-        $(PERL) ../script/mkparamdefs.pl $(srcdir)/param/loadparm.c --file param/param_global.h --generate-scope=GLOBAL
-../lib/param/param_proto.h:
-        $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/loadparm.c --public ../lib/param/param_proto.h  --private ../lib/param/param_proto.h
-../lib/param/s3_param.h:
-        $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/loadparm.c --file ../lib/param/s3_param.h
+autoconf/lib/param/param_local.h:
+        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL
+autoconf/lib/param/param_global.h:
+        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL
+autoconf/source3/param/param_global.h:
+        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL
+autoconf/lib/param/param_proto.h:
+        $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public autoconf/lib/param/param_proto.h  --private autoconf/lib/param/param_proto.h
+autoconf/lib/param/s3_param.h:
+        $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/s3_param.h
 
 
 #####################################################################
@@ -2102,30 +2103,7 @@ MKSYMS_SH = $(srcdir)/script/mksyms.sh
 LIBTALLOC_OBJ0 = @LIBTALLOC_OBJ0@
 LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
 
-LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
-LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
-LIBTALLOC_FULLVER=@LIBTALLOC_FULLVER@
-LIBTALLOC_SHARED_TARGET_SONAME=@LIBTALLOC_SHARED_TARGET_SOVER@
-LIBTALLOC_SHARED_TARGET_FULLVER=@LIBTALLOC_SHARED_TARGET_FULLVER@
 LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
-LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
-LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-
-$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
-       @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-
-$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
-       @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBTALLOC_OBJ) $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
-
-$(LIBTALLOC_SHARED_TARGET_FULLVER): $(LIBTALLOC_SHARED_TARGET_SONAME)
-       @rm -f $@
-       @mv -f $(LIBTALLOC_SHARED_TARGET_SONAME) $@
-       @ln -f -s `basename $@` $(LIBTALLOC_SHARED_TARGET_SONAME)
-
-$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_FULLVER)
-       @rm -f $@
-       @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
        @echo Linking non-shared library $@
@@ -2134,51 +2112,14 @@ libtalloc: $(LIBTALLOC)
 
 cleanlibtalloc::
        -rm -f \
-               $(LIBTALLOC_SYMS) \
-               $(LIBTALLOC_STATIC_TARGET) \
-               $(LIBTALLOC_SHARED_TARGET) \
-               $(LIBTALLOC_SHARED_TARGET_SONAME)
-
-installlibtalloc:: installdirs libtalloc
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-       -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR)
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
-       -if test -r $(LIBTALLOC_SHARED_TARGET_FULLVER) ; then \
-               ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_FULLVER)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)` ; \
-       fi
-       -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
-               ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
-       fi
-       -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-       -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
-
-uninstalllibtalloc::
-       -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
-       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
-       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
-       -rm -f $(DESTDIR)${prefix}/include/talloc.h
+               $(LIBTALLOC_STATIC_TARGET)
 
 libs:: libtalloc
-installlibs:: @INSTALL_LIBTALLOC@
-uninstalllibs:: @UNINSTALL_LIBTALLOC@
 cleanlibs:: cleanlibtalloc
-shlibs test_shlibs: @LIBTALLOC_SHARED@
 
 showlibtalloc:
        @echo  ""
-       @echo "LIBTALLOC_SHARED                = @LIBTALLOC_SHARED@"
        @echo "LIBTALLOC_STATIC                = @LIBTALLOC_STATIC@"
-       @echo "LIBTALLOC_LIBS                  = $(LIBTALLOC_LIBS)"
-       @echo ""
-       @echo "LIBTALLOC_SHARED_TARGET         = $(LIBTALLOC_SHARED_TARGET)"
-       @echo "LIBTALLOC_SOVER                 = $(LIBTALLOC_SOVER)"
-       @echo "LIBTALLOC_FULLVER               = $(LIBTALLOC_FULLVER)"
-       @echo "LIBTALLOC_SHARED TARGET_SONAME  = $(LIBTALLOC_SHARED_TARGET_SONAME)"
-       @echo "LIBTALLOC_SHARED TARGET_FULLVER = $(LIBTALLOC_SHARED_TARGET_FULLVER)"
        @echo "LIBTALLOC_STATIC_TARGET         = $(LIBTALLOC_STATIC_TARGET)"
        @echo "LIBTALLOC                       = $(LIBTALLOC)"
 
@@ -2193,32 +2134,7 @@ showlibs:: showlibtalloc
 LIBTDB_OBJ0 = @LIBTDB_OBJ0@
 LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
-LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
-LIBTDB_SOVER=@LIBTDB_SOVER@
-LIBTDB_FULLVER=@LIBTDB_FULLVER@
-LIBTDB_SHARED_TARGET_SONAME=@LIBTDB_SHARED_TARGET_SOVER@
-LIBTDB_SHARED_TARGET_FULLVER=@LIBTDB_SHARED_TARGET_FULLVER@
 LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
-LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@
-LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
-
-$(LIBTDB_SYMS): $(LIBTDB_HEADERS)
-       @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
-
-
-$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
-       @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBTDB_OBJ) $(LIBREPLACE_LIBS) $(TDB_DEPS) \
-               @SONAMEFLAG@`basename $@`
-
-$(LIBTDB_SHARED_TARGET_FULLVER): $(LIBTDB_SHARED_TARGET_SONAME)
-       @rm -f $@
-       @mv -f $(LIBTDB_SHARED_TARGET_SONAME) $(LIBTDB_SHARED_TARGET_FULLVER)
-       @ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` $(LIBTDB_SHARED_TARGET_SONAME)
-
-$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_FULLVER)
-       @rm -f $@
-       @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
        @echo Linking non-shared library $@
@@ -2228,52 +2144,14 @@ libtdb: $(LIBTDB)
 
 cleanlibtdb::
        -rm -f \
-               $(LIBTDB_SYMS) \
-               $(LIBTDB_STATIC_TARGET) \
-               $(LIBTDB_SHARED_TARGET) \
-               $(LIBTDB_SHARED_TARGET_SONAME)
-
-
-installlibtdb:: installdirs libtdb
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-       -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR)
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
-       -if test -r $(LIBTDB_SHARED_TARGET_FULLVER) ; then \
-               ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)` ; \
-       fi
-       -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
-               ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
-       fi
-       -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-       -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include
-
-uninstalllibtdb::
-       -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
-       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
-       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)`
-       -rm -f $(DESTDIR)${prefix}/include/tdb.h
+               $(LIBTDB_STATIC_TARGET)
 
 libs:: libtdb
-installlibs:: @INSTALL_LIBTDB@
-uninstalllibs:: @UNINSTALL_LIBTDB@
 cleanlibs:: cleanlibtdb
-shlibs test_shlibs: @LIBTDB_SHARED@
 
 showlibtdb:
        @echo  ""
-       @echo "LIBTDB_SHARED                = @LIBTDB_SHARED@"
        @echo "LIBTDB_STATIC                = @LIBTDB_STATIC@"
-       @echo "LIBTDB_LIBS                  = $(LIBTDB_LIBS)"
-       @echo ""
-       @echo "LIBTDB_SHARED_TARGET         = $(LIBTDB_SHARED_TARGET)"
-       @echo "LIBTDB_SOVER                 = $(LIBTDB_SOVER)"
-       @echo "LIBTDB_FULLVER               = $(LIBTDB_FULLVER)"
-       @echo "LIBTDB_SHARED TARGET_SONAME  = $(LIBTDB_SHARED_TARGET_SONAME)"
-       @echo "LIBTDB_SHARED TARGET_FULLVER = $(LIBTDB_SHARED_TARGET_FULLVER)"
        @echo "LIBTDB_STATIC_TARGET         = $(LIBTDB_STATIC_TARGET)"
        @echo "LIBTDB                       = $(LIBTDB)"
 
@@ -2754,7 +2632,7 @@ bin/vlp: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) $(LIBTALLOC)
 bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
        @echo "Linking $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
-               @SONAMEFLAG@`basename $@`
+               $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
 
 bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
        @echo "Linking shared library $@"
@@ -2777,10 +2655,6 @@ bin/script.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SCRIPT_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(AUTH_SCRIPT_OBJ)
 
-bin/netlogond.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_NETLOGOND_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(AUTH_NETLOGOND_OBJ)
-
 bin/winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_WINBIND_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(AUTH_WINBIND_OBJ)
@@ -2803,10 +2677,6 @@ bin/ldapsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ldap.o passdb/pdb_nds.o \
        @$(SHLD_MODULE) passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o \
                        passdb/pdb_ldap_util.o $(LDAP_LIBS)
 
-bin/ads.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ads.o
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) passdb/pdb_ads.o
-
 bin/tdbsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_tdb.o
        @echo "Building plugin $@"
        @$(SHLD_MODULE) passdb/pdb_tdb.o
@@ -3188,7 +3058,6 @@ installmodules:: modules installdirs
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES)
-       @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
@@ -3297,7 +3166,6 @@ uninstallmodules::
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
-       @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
@@ -3331,12 +3199,11 @@ cleanlibs::
 clean:: cleanlibs
        -rm -f include/build_env.h
        -rm -f smbd/build_options.c
-       -rm -f param/param_local.h
-       -rm -f param/param_global.h
-       -rm -f ../lib/param/param_local.h
-       -rm -f ../lib/param/param_global.h
-       -rm -f ../lib/param/param_proto.h
-       -rm -f ../lib/param/s3_param.h
+       -rm -f autoconf/lib/param/param_local.h
+       -rm -f autoconf/lib/param/param_global.h
+       -rm -f autoconf/lib/param/param_proto.h
+       -rm -f autoconf/lib/param/s3_param.h
+       -rm -f autoconf/source3/param/param_global.h
        -rm -f $(PRECOMPILED_HEADER)
        -rm -f core */*~ *~ \
                */*.o */*/*.o */*/*/*.o */*/*/*/*.o \
@@ -3380,15 +3247,6 @@ realdistclean:: distclean
        -rm -f include/version.h
        -rm -f configure
 
-# this target is really just for my use. It only works on a limited
-# range of machines and is used to produce a list of potentially
-# dead (ie. unused) functions in the code. (tridge)
-finddead::
-       nm */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
-       nm */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
-       comm -13 nmused.txt nmfns.txt
-
-
 # when configure.in is updated, reconfigure
 $(srcdir)/configure: $(srcdir)/configure.in
        @echo "WARNING: you need to rerun ./autogen.sh"
@@ -3524,7 +3382,7 @@ bin/ndrdump4: $(BINARY_PREREQS)
 vfs_examples:
        ( \
        cd ../examples/VFS && \
-       ./autogen.sh && \
+       test -e ./configure || exit 0 && \
        ./configure && \
        make clean && \
        make \