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

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 (modified) (30 diffs)

branches/samba-3.2.x/source/Makefile

@@ -20 +20 @@
 smbtorture4_path=
 
-LIBS=-lsocket -lsyslog -lurpo
+LIBS=
 CC=gcc
 SHLD=shared-libraries-disabled
@@ -178 +178 @@
 SBIN_PROGS = bin/smbd.exe bin/nmbd.exe bin/swat$(EXEEXT) 
 
-ROOT_SBIN_PROGS =  
+ROOT_SBIN_PROGS = 
 
 BIN_PROGS1 = bin/smbclient.exe bin/net.exe bin/smbspool.exe \
@@ -222 +222 @@
           $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES)
 
-######################################################################
+EXTRA_ALL_TARGETS = 
+
+#####################################################################
 # object file lists
 ######################################################################
@@ -229 +231 @@
           lib/dbwrap.o lib/dbwrap_tdb.o \
           lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \
-          lib/dbwrap_rbt.o bin/libtdb.a
+          lib/dbwrap_rbt.o $(LIBTDB_OBJ0)
 
 SMBLDAP_OBJ =  
@@ -293 +295 @@
 NSS_WRAPPER_OBJ = 
 
-LIBSAMBAUTIL_OBJ = bin/libtalloc.a \
+LIBSAMBAUTIL_OBJ = $(LIBTALLOC_OBJ0) \
                 $(LIBREPLACE_OBJ) \
                 $(SOCKET_WRAPPER_OBJ) \
@@ -346 +348 @@
 LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o  libaddns/dnssock.o \
                libaddns/dnsgss.o libaddns/dnsmarshall.o
-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) bin/libtalloc.a
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) $(LIBTALLOC_OBJ0)
 
 LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
@@ -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
@@ -647 +650 @@
                smbd/file_access.o \
                smbd/dnsregister.o \
-               $(MANGLE_OBJ)  $(VFS_DEFAULT_OBJ) $(VFS_RECYCLE_OBJ) $(VFS_AUDIT_OBJ) $(VFS_EXTD_AUDIT_OBJ) $(VFS_FULL_AUDIT_OBJ) $(VFS_NETATALK_OBJ) $(VFS_FAKE_PERMS_OBJ) $(VFS_DEFAULT_QUOTA_OBJ) $(VFS_READONLY_OBJ) $(VFS_CAP_OBJ) $(VFS_EXPAND_MSDFS_OBJ) $(VFS_SHADOW_COPY_OBJ) $(VFS_SHADOW_COPY2_OBJ) $(VFS_XATTR_TDB_OBJ) $(VFS_STREAMS_XATTR_OBJ) $(VFS_READAHEAD_OBJ)
+               $(MANGLE_OBJ)  $(VFS_DEFAULT_OBJ) $(VFS_RECYCLE_OBJ) $(VFS_AUDIT_OBJ) $(VFS_EXTD_AUDIT_OBJ) $(VFS_FULL_AUDIT_OBJ) $(VFS_NETATALK_OBJ) $(VFS_FAKE_PERMS_OBJ) $(VFS_DEFAULT_QUOTA_OBJ) $(VFS_READONLY_OBJ) $(VFS_CAP_OBJ) $(VFS_EXPAND_MSDFS_OBJ) $(VFS_SHADOW_COPY_OBJ) $(VFS_SHADOW_COPY2_OBJ) $(VFS_XATTR_TDB_OBJ) $(VFS_STREAMS_XATTR_OBJ) $(VFS_STREAMS_DEPOT_OBJ) $(VFS_READAHEAD_OBJ) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
 
 SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
@@ -842 +845 @@
           $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
           $(LDB_OBJ) $(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) \
-          $(REG_SMBCONF_OBJ) bin/libnetapi.a $(LIBNET_OBJ) \
+          $(REG_SMBCONF_OBJ) $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
           $(LIBSMBCONF_OBJ) \
           bin/libwbclient.a \
@@ -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
@@ -1058 +1061 @@
 
 TDBBACKUP_OBJ = lib/tdb/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
-        bin/libtdb.a $(SOCKET_WRAPPER_OBJ)
-
-TDBTOOL_OBJ = lib/tdb/tools/tdbtool.o bin/libtdb.a $(LIBREPLACE_OBJ) \
+        $(LIBTDB_OBJ0) $(SOCKET_WRAPPER_OBJ)
+
+TDBTOOL_OBJ = lib/tdb/tools/tdbtool.o $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) \
         $(SOCKET_WRAPPER_OBJ)
 
-TDBDUMP_OBJ = lib/tdb/tools/tdbdump.o bin/libtdb.a $(LIBREPLACE_OBJ) \
+TDBDUMP_OBJ = lib/tdb/tools/tdbdump.o $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) \
         $(SOCKET_WRAPPER_OBJ)
 
-TDBTORTURE_OBJ = lib/tdb/tools/tdbtorture.o bin/libtdb.a $(LIBREPLACE_OBJ) \
+TDBTORTURE_OBJ = lib/tdb/tools/tdbtorture.o $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) \
         $(SOCKET_WRAPPER_OBJ)
 
@@ -1093 +1096 @@
 ######################################################################
 all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
-        $(MODULES) $(NSS_MODULES) $(PAM_MODULES) 
+        $(MODULES) $(NSS_MODULES) $(PAM_MODULES)  \
+        $(EXTRA_ALL_TARGETS)
 
 nss_modules:: $(NSS_MODULES)
@@ -1325 +1329 @@
                 -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
                 $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
-                $(LIBTDB_LIBS)
+                $(LIBTDB_LIBS) $(NSCD_LIBS)
 
 bin/testparm.exe: $(BINARY_PREREQS) $(TESTPARM_OBJ)   
@@ -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)` ; \
@@ -1677 +1681 @@
 LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
                   $(WBCOMMON_OBJ) \
-                  bin/libtalloc.a $(LIBREPLACE_OBJ)
+                  $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
 
 LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.shared_libraries_disabled
@@ -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)` ; \
@@ -1799 +1803 @@
 #-------------------------------------------------------------------
 
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
+LIBNETAPI_OBJ0 = lib/netapi/netapi.o \
                  lib/netapi/cm.o \
                  librpc/gen_ndr/ndr_libnetapi.o \
@@ -1808 +1812 @@
                  lib/netapi/user.o
 
-LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
+LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
                  $(LIBSMBCONF_OBJ) \
                  $(REG_SMBCONF_OBJ) \
@@ -1839 +1843 @@
         @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
-$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
+$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
         @echo Linking non-shared library $@
-        @-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
+        @-$(AR) -rc $@ $(LIBNETAPI_OBJ0)
 
 libnetapi: $(LIBNETAPI)
@@ -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)` ; \
@@ -1949 +1953 @@
 LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
 
-LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) bin/libtdb.a
+LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) $(LIBTDB_OBJ0)
 
 LIBSMBSHAREMODES_SHARED_TARGET=bin/libsmbsharemodes.shared_libraries_disabled
@@ -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.shared_libraries_disabled: $(BINARY_PREREQS) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
+        @echo "Building plugin $@"
+        @$(SHLD_MODULE) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
 #########################################################
 ## IdMap NSS plugins
@@ -2440 +2447 @@
 
 installcifsupcall:: 
-        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR)
-        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) 
+        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(SBINDIR)
+        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) 
 
 # Some symlinks are required for the 'probing' of modules.
@@ -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}.shared_libraries_disabled \