Changeset 228 for branches/samba-3.2.x/source/Makefile.in

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/Makefile.in (modified) (16 diffs)

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

@@ -176 +176 @@
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
+SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
 
 ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
@@ -222 +222 @@
           $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES)
 
-######################################################################
+EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
+
+#####################################################################
 # object file lists
 ######################################################################
@@ -602 +604 @@
 VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
 VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
+VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
 
 PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@ -851 +854 @@
           $(LIBNDR_GEN_OBJ0)
 
-CIFS_MOUNT_OBJ = client/mount.cifs.o
-
-CIFS_UMOUNT_OBJ = client/umount.cifs.o
+CIFS_MOUNT_OBJ = client/mount.cifs.o client/mtab.o
+
+CIFS_UMOUNT_OBJ = client/umount.cifs.o client/mtab.o
 
 CIFS_UPCALL_OBJ = client/cifs.upcall.o
@@ -1093 +1096 @@
 ######################################################################
 all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
-        $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
+        $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @CIFSUPCALL_PROGS@ \
+        $(EXTRA_ALL_TARGETS)
 
 nss_modules:: $(NSS_MODULES)
@@ -1576 +1580 @@
         -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
-        -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
@@ -1643 +1647 @@
         -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
-        -if test -e $(LIBTDB_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
@@ -1716 +1720 @@
         -$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
-        -if test -e $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
@@ -1776 +1780 @@
         -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
-        -if test -e $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
@@ -1856 +1860 @@
         -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
-        -if test -e $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
@@ -1917 +1921 @@
         -$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
-        -if test -e $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
@@ -1988 +1992 @@
         -$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
-        -if test -e $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
+        -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
                 ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
@@ -2346 +2350 @@
         @$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
 
+bin/smb_traffic_analyzer.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
+        @echo "Building plugin $@"
+        @$(SHLD_MODULE) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
 #########################################################
 ## IdMap NSS plugins
@@ -2698 +2705 @@
 test_shlibs:
         @echo "Testing $? "
-        @export $(LIB_PATH_VAR)=./bin && \
+        @$(LIB_PATH_VAR)=./bin && \
+        export $(LIB_PATH_VAR) && \
         for module in $?; do \
                 ./script/tests/dlopen.sh $${module} \
@@ -2707 +2715 @@
 test_nss_modules:: nss_modules
         @echo "Testing $(NSS_MODULES) "
-        @export $(LIB_PATH_VAR)=./bin && \
+        @$(LIB_PATH_VAR)=./bin && \
+        export $(LIB_PATH_VAR) && \
         for module in $(NSS_MODULES); do \
                 ./script/tests/dlopen.sh $${module} \
@@ -2717 +2726 @@
 test_pam_modules:: pam_modules
         @echo "Testing $(PAM_MODULES) "
-        @export $(LIB_PATH_VAR)=./bin && \
+        @$(LIB_PATH_VAR)=./bin && \
+        export $(LIB_PATH_VAR) && \
         for module in $(PAM_MODULES); do \
                 ./script/tests/dlopen.sh -lpam -ldl bin/$${module}.@SHLIBEXT@ \