Changeset 223 for branches/samba-3.3.x/source/Makefile.in

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/Makefile.in (modified) (13 diffs)

branches/samba-3.3.x/source/Makefile.in

@@ -70 +70 @@
 PAM_WINBIND_EXTRA_LIBS=@PAM_WINBIND_EXTRA_LIBS@
 DNSSD_LIBS=@DNSSD_LIBS@
+AVAHI_LIBS=@AVAHI_LIBS@
 POPT_LIBS=@POPTLIBS@
 LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
@@ -250 +251 @@
 
 AFS_SETTOKEN_OBJ = lib/afs_settoken.o
+
+AVAHI_OBJ = @AVAHI_OBJ@
 
 SERVER_MUTEX_OBJ = lib/server_mutex.o
@@ -576 +579 @@
                 passdb/login_cache.o @PDB_STATIC@ \
                 lib/account_pol.o $(PRIVILEGES_OBJ) \
-                lib/util_nscd.o lib/winbind_util.o
+                lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
 
 DEVEL_HELP_WEIRD_OBJ = modules/weird.o
@@ -636 +639 @@
 VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
 VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
+VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
 
 PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@ -671 +675 @@
                smbd/blocking.o smbd/sec_ctx.o smbd/srvstr.o \
                smbd/vfs.o smbd/statcache.o smbd/seal.o \
-               smbd/posix_acls.o lib/sysacls.o $(SERVER_MUTEX_OBJ) \
+               smbd/posix_acls.o lib/sysacls.o \
                smbd/process.o smbd/service.o smbd/error.o \
                printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
@@ -688 +692 @@
                 $(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
                 $(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
-                $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
+                $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(AVAHI_OBJ) \
                 $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
                 $(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
@@ -789 +793 @@
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \
-                  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
+                  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@ @LIBTALLOC_STATIC@
 
 LIBSMBCLIENT_OBJ0 = \
@@ -882 +886 @@
           $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
           $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
-          $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
+          $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
           $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
           $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
@@ -1044 +1048 @@
                 $(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
                 $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
-                $(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ) $(LDB_OBJ) 
+                $(LIBADS_SERVER_OBJ) $(LDB_OBJ) 
 
 WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
@@ -1110 +1114 @@
 NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
                 libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o libads/kerberos.o \
-                $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
+                $(LIBADS_SERVER_OBJ) \
                 $(PASSDB_OBJ) $(GROUPDB_OBJ) \
                 $(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
@@ -1328 +1332 @@
         @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
                 $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-                $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \
+                $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
                 $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                 $(WINBIND_LIBS)
@@ -1513 +1517 @@
 bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
         @echo Linking $@
-        @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
+        @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
                 $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
                 $(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
@@ -2462 +2466 @@
         @echo "Building plugin $@"
         @$(SHLD_MODULE) libgpo/gpext/security.o
+
+bin/dirsort.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_DIRSORT_OBJ)
+        @echo "Building plugin $@"
+        @$(SHLD_MODULE) $(VFS_DIRSORT_OBJ)
 
 #########################################################