s3-vfs: Use the system. namespace for fake ACLs
[kai/samba.git] / source3 / Makefile.in
index f4b00a7ff035617e0f8dc5c6d539e104ab9b8781..57c6c1db1c4aecefcf5b9128a1584b9fe74e120a 100644 (file)
@@ -223,7 +223,7 @@ BIN_PROGS3 = bin/smbpasswd bin/rpcclient bin/smbcacls \
 TORTURE_PROGS = bin/smbtorture bin/msgtest \
        bin/masktest bin/locktest \
        bin/locktest2 bin/nsstest bin/vfstest \
-       bin/pdbtest $(TALLOCTORT) bin/replacetort \
+       $(TALLOCTORT) bin/replacetort \
        $(TDBTORTURE) $(PTHREADPOOLTEST) \
        bin/smbconftort bin/vlp
 
@@ -263,6 +263,7 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
 TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
          ../lib/tdb_wrap/tdb_wrap.o \
          ../lib/dbwrap/dbwrap.o \
+         ../lib/dbwrap/dbwrap_local_open.o \
          lib/dbwrap/dbwrap_open.o \
          ../lib/dbwrap/dbwrap_tdb.o \
          lib/dbwrap/dbwrap_ctdb.o \
@@ -382,7 +383,8 @@ LIBCLI_SAMR_OBJ = autoconf/librpc/gen_ndr/ndr_samr_c.o \
 
 LIBCLI_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon_c.o \
                      rpc_client/cli_netlogon.o \
-                     rpc_client/util_netlogon.o
+                     rpc_client/util_netlogon.o \
+                     rpc_client/init_netlogon.o
 
 LIBCLI_EPMAPPER_OBJ = autoconf/librpc/gen_ndr/ndr_epmapper_c.o
 
@@ -432,14 +434,15 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
                   lib/tevent_barrier.o \
                   ../lib/util/smb_threads.o ../lib/util/util_id.o \
                   ../lib/util/blocking.o ../lib/util/rfc1738.o \
-                  ../lib/util/select.o ../lib/util/util_pw.o ../lib/util/server_id.o
+                  ../lib/util/select.o ../lib/util/util_pw.o ../lib/util/server_id.o \
+                  ../lib/util/setid.o ../lib/util/pidfile.o
 
 CRYPTO_OBJ = ../lib/crypto/crc32.o @CRYPTO_MD5_OBJ@ \
                         ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
                         ../lib/crypto/md4.o \
                         ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o \
                         ../lib/crypto/aes.o ../lib/crypto/rijndael-alg-fst.o \
-                        ../lib/crypto/aes_cmac_128.o
+                        ../lib/crypto/aes_cmac_128.o ../lib/crypto/aes_ccm_128.o
 
 LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          lib/messages.o autoconf/librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
@@ -450,19 +453,20 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          ../lib/socket/interfaces.o lib/memcache.o \
          lib/talloc_dict.o \
          lib/serverid.o \
+         lib/asys/asys.o \
          lib/util_transfer_file.o ../lib/async_req/async_sock.o \
          lib/addrchange.o \
          $(TDB_LIB_OBJ) \
          $(VERSION_OBJ) lib/charcnv.o ../lib/util/charset/convert_string.o \
          ../lib/util/charset/pull_push.o \
          lib/fstring.o ../lib/util/debug.o ../lib/util/debug_s3.o ../lib/util/fault.o \
-         lib/interface.o lib/pidfile.o lib/dumpcore.o \
+         lib/interface.o lib/dumpcore.o \
          lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
          lib/username.o \
          ../libds/common/flag_mapping.o \
          lib/access.o lib/smbrun.o \
          ../lib/util/bitmap.o ../lib/util/dprintf.o $(UTIL_REG_OBJ) \
-         lib/wins_srv.o lib/string_init.o \
+         lib/wins_srv.o \
          lib/util_str.o ../lib/util/util_str_common.o \
          ../lib/util/util_str.o \
          ../lib/util/base64.o lib/util_sid.o \
@@ -491,6 +495,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          lib/fncall.o \
          libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \
          lib/file_id.o lib/idmap_cache.o \
+         lib/tevent_wait.o \
          ../libcli/security/dom_sid.o ../libcli/security/security_descriptor.o \
          ../libcli/security/security_token.o ../libcli/security/util_sid.o \
          ../libcli/smb/util.o ../lib/util/idtree.o
@@ -647,6 +652,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 
 LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
               rpc_client/cli_pipe.o \
+              $(LIBCLI_NETLOGON_OBJ) \
               librpc/crypto/gse_krb5.o \
               librpc/crypto/gse.o \
               ../auth/kerberos/gssapi_pac.o \
@@ -800,12 +806,10 @@ RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
                 $(LIBCLI_SRVSVC_OBJ) \
                 $(LIBCLI_LSA_OBJ) \
                 $(LIBCLI_SAMR_OBJ) \
-                $(LIBCLI_NETLOGON_OBJ) \
                 $(RPC_SERVER_REGISTER_OBJ) \
                 $(RPC_CLIENT_SCHANNEL_OBJ) \
                 rpc_server/rpc_sock_helper.o \
                 rpc_server/rpc_service_setup.o \
-                rpc_client/init_netlogon.o \
                 rpc_client/init_samr.o
 
 RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
@@ -878,13 +882,13 @@ VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
 VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
 VFS_COMMIT_OBJ = modules/vfs_commit.o
 VFS_GPFS_OBJ = modules/vfs_gpfs.o modules/gpfs.o modules/nfs4_acls.o
-VFS_GPFS_HSM_NOTIFY_OBJ = modules/vfs_gpfs_hsm_notify.o
 VFS_NOTIFY_FAM_OBJ = modules/vfs_notify_fam.o
 VFS_READAHEAD_OBJ = modules/vfs_readahead.o
 VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
 VFS_FILEID_OBJ = modules/vfs_fileid.o
 VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
 VFS_AIO_PTHREAD_OBJ = modules/vfs_aio_pthread.o
+VFS_AIO_POSIX_OBJ = modules/vfs_aio_posix.o
 VFS_AIO_LINUX_OBJ = modules/vfs_aio_linux.o
 VFS_PREOPEN_OBJ = modules/vfs_preopen.o
 VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
@@ -897,6 +901,7 @@ VFS_SCANNEDONLY_OBJ = modules/vfs_scannedonly.o
 VFS_CROSSRENAME_OBJ = modules/vfs_crossrename.o
 VFS_LINUX_XFS_SGID_OBJ = modules/vfs_linux_xfs_sgid.o
 VFS_TIME_AUDIT_OBJ = modules/vfs_time_audit.o
+VFS_MEDIA_HARMONY_OBJ = modules/vfs_media_harmony.o
 
 PAM_ERRORS_OBJ = ../libcli/auth/pam_errors.o
 PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o $(PAM_ERRORS_OBJ)
@@ -973,6 +978,11 @@ SMBD_OBJ_SRV = smbd/server_reload.o \
               smbd/smb2_getinfo.o \
               smbd/smb2_setinfo.o \
               smbd/smb2_break.o \
+              autoconf/librpc/gen_ndr/ndr_smbXsrv.o \
+              smbd/smbXsrv_version.o \
+              smbd/smbXsrv_session.o \
+              smbd/smbXsrv_tcon.o \
+              smbd/smbXsrv_open.o \
               $(MANGLE_OBJ) @VFS_STATIC@
 
 SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
@@ -1044,6 +1054,7 @@ STATUS_OBJ = utils/status.o utils/status_profile.o \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
             $(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
 
+
 SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
        $(LIBSMB_ERR_OBJ) $(POPT_LIB_OBJ) $(PRINTBASE_OBJ)
 
@@ -1118,10 +1129,8 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
             $(LIBCLI_LSA_OBJ) \
             $(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
 
 PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
@@ -1181,7 +1190,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
                  $(POPT_LIB_OBJ)
 
 PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \
-               lib/pthreadpool/tests.o
+               lib/pthreadpool/tests.o $(LIBREPLACE_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
             libnet/libnet_keytab.o \
@@ -1211,7 +1220,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
           $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
           utils/net_conf.o utils/net_join.o utils/net_user.o \
           utils/net_group.o utils/net_file.o utils/net_registry.o utils/net_registry_check.o\
-          auth/token_util.o utils/net_dom.o utils/net_share.o \
+          auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_connections.o\
           utils/net_g_lock.o \
           utils/net_serverid.o \
           utils/net_eventlog.o \
@@ -1230,9 +1239,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
           $(LIBCLI_SRVSVC_OBJ) \
           $(LIBCLI_LSA_OBJ) \
           $(LIBCLI_SAMR_OBJ) \
-          $(LIBCLI_NETLOGON_OBJ) \
           $(RPC_CLIENT_SCHANNEL_OBJ) \
-          rpc_client/init_netlogon.o \
           rpc_client/init_samr.o \
           registry/reg_parse.o registry/reg_format.o \
           registry/reg_import.o \
@@ -1308,12 +1315,7 @@ LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \
                $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
                $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(FNAME_UTIL_OBJ)
 
-NSSTEST_OBJ = ../nsswitch/nsstest.o $(LIBSAMBAUTIL_OBJ)
-
-PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-               $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-               $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) \
-               $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
+NSSTEST_OBJ = ../nsswitch/nsstest.o ../lib/util/setid.o $(LIBSAMBAUTIL_OBJ)
 
 VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) \
                torture/vfstest_chain.o
@@ -1392,14 +1394,6 @@ IDMAP_HASH_OBJ = \
                winbindd/idmap_hash/idmap_hash.o \
                winbindd/idmap_hash/mapfile.o
 
-IDMAP_ADEX_OBJ = \
-               winbindd/idmap_adex/idmap_adex.o \
-               winbindd/idmap_adex/cell_util.o \
-               winbindd/idmap_adex/likewise_cell.o \
-               winbindd/idmap_adex/provider_unified.o \
-               winbindd/idmap_adex/gc_util.o \
-               winbindd/idmap_adex/domain_util.o
-
 WINBINDD_OBJ1 = \
                winbindd/winbindd.o       \
                winbindd/winbindd_group.o \
@@ -1517,8 +1511,6 @@ WINBINDD_OBJ = \
                $(LIBCLI_DSSETUP_OBJ) \
                $(LIBCLI_LSA_OBJ) \
                $(LIBCLI_SAMR_OBJ) \
-               $(LIBCLI_NETLOGON_OBJ) \
-               rpc_client/init_netlogon.o \
                rpc_client/init_samr.o \
                $(PAM_ERRORS_OBJ)
 
@@ -1567,7 +1559,32 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} \
 
 
 VLP_OBJ = printing/tests/vlp.o \
-         ../lib/util/util_tdb.o \
+          ../lib/util/util_tdb.o \
+          ../lib/util/signal.o \
+          ../lib/util/debug.o \
+          ../lib/util/util_strlist.o \
+          ../lib/util/fault.o \
+          ../lib/util/become_daemon.o \
+          ../lib/util/substitute.o \
+          lib/util_sec.o \
+          ../lib/util/time.o \
+          ../lib/util/charset/util_str.o \
+          ../lib/util/charset/pull_push.o \
+          ../lib/util/charset/util_unistr_w.o \
+          ../lib/util/charset/codepoints.o \
+          ../lib/util/charset/iconv.o \
+          ../lib/util/charset/weird.o \
+          ../lib/util/charset/convert_string.o \
+          $(CHARSET_MACOSXFS_OBJ) \
+          ../lib/util/talloc_stack.o \
+          ../lib/util/smb_threads.o \
+          ../lib/util/xfile.o \
+          ../lib/util/util_file.o \
+          ../lib/util/util.o \
+          ../lib/util/util_str_common.o \
+          ../lib/util/data_blob.o \
+          ../dynconfig/dynconfig.o \
+         ../lib/util/setid.o \
          $(LIBSAMBAUTIL_OBJ) \
          param/util.o
 
@@ -1838,13 +1855,6 @@ libsmb/libsmb_thread_posix.o: libsmb/libsmb_thread_posix.c
                $(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
 ### End section of object files that require PTHREAD_CFLAGS
 
-lib/pidfile.o: lib/pidfile.c
-       @echo Compiling $*.c
-       @$(COMPILE_CC_PATH) && exit 0;\
-               echo "The following command failed:" 1>&2;\
-               echo "$(COMPILE_CC_PATH)" 1>&2;\
-               $(COMPILE_CC_PATH) >/dev/null 2>&1
-
 lib/version.o: lib/version.c include/autoconf/version.h
        @echo Compiling $*.c
        @$(COMPILE_CC_PATH) && exit 0;\
@@ -1973,7 +1983,7 @@ bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LI
        @$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ)
        @echo Linking $@
        @$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
@@ -2047,12 +2057,6 @@ bin/nsstest: $(BINARY_PREREQS) $(NSSTEST_OBJ) $(LIBTALLOC)
        @$(CC) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(LIBTALLOC_LIBS)
 
-bin/pdbtest: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
-       @echo Linking $@
-       @$(CC) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-               $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
-               $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-
 bin/vfstest: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
@@ -2293,9 +2297,7 @@ LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
                 $(LIBCLI_SRVSVC_OBJ) \
                 $(LIBCLI_LSA_OBJ) \
                 $(LIBCLI_SAMR_OBJ) \
-                $(LIBCLI_NETLOGON_OBJ) \
                 $(RPC_CLIENT_SCHANNEL_OBJ) \
-                rpc_client/init_netlogon.o \
                 rpc_client/init_samr.o
 
 LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
@@ -2715,10 +2717,6 @@ bin/hash.@SHLIBEXT@: $(BINARY_PREREQS) $(IDMAP_HASH_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(IDMAP_HASH_OBJ)
 
-bin/adex.@SHLIBEXT@: $(BINARY_PREREQS) $(IDMAP_ADEX_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(IDMAP_ADEX_OBJ)
-
 bin/tdb2.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
@@ -2850,10 +2848,6 @@ bin/gpfs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_GPFS_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_GPFS_OBJ)
 
-bin/gpfs_hsm_notify.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_GPFS_HSM_NOTIFY_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(VFS_GPFS_HSM_NOTIFY_OBJ)
-
 bin/notify_fam.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_NOTIFY_FAM_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ) @SMB_FAM_LIBS@
@@ -2878,6 +2872,10 @@ bin/aio_pthread.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_PTHREAD_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_AIO_PTHREAD_OBJ)
 
+bin/aio_posix.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_POSIX_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(VFS_AIO_POSIX_OBJ)
+
 bin/aio_linux.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_LINUX_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_AIO_LINUX_OBJ)
@@ -2934,6 +2932,10 @@ bin/time_audit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_TIME_AUDIT_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_TIME_AUDIT_OBJ)
 
+bin/media_harmony.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_MEDIA_HARMONY_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(VFS_MEDIA_HARMONY_OBJ)
+
 #########################################################
 ## IdMap NSS plugins
 
@@ -3011,7 +3013,7 @@ bin/dbwrap_tool: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
 install-dbwrap_tool:: bin/dbwrap_tool
        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
 
-bin/dbwrap_torture: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/dbwrap_torture: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB) $(POPT_LIBS)
        @echo "Linking $@"
        @$(CC) -o $@ $(DBWRAP_TORTURE_OBJ)\
                $(LDFLAGS) $(DYNEXP) $(LIBS) \
@@ -3068,14 +3070,11 @@ installmodules:: modules installdirs
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ NDS_ldapsam.@SHLIBEXT@
-       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ NDS_ldapsam_compat.@SHLIBEXT@
-       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ ldapsam_compat.@SHLIBEXT@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) rhosts.@SHLIBEXT@ hostsequiv.@SHLIBEXT@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) sam.@SHLIBEXT@ sam_ignoredomain.@SHLIBEXT@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) domain.@SHLIBEXT@ trustdomain.@SHLIBEXT@ ntdomain.@SHLIBEXT@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) builtin.@SHLIBEXT@ guest.@SHLIBEXT@ fixed_challenge.@SHLIBEXT@ name_to_ntstatus.@SHLIBEXT@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@ sfu20.@SHLIBEXT@
-       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/adex.@SHLIBEXT@ adex.@SHLIBEXT@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/hash.@SHLIBEXT@ hash.@SHLIBEXT@
 
 installscripts:: installdirs
@@ -3390,6 +3389,6 @@ vfs_examples:
        ( \
        cd ../examples/VFS && \
        ./configure && \
-       make clean && \
-       make \
+       $(MAKE) clean && \
+       $(MAKE) \
        )