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

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

File:

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

branches/samba-3.2.x/source/Makefile

@@ -548 +548 @@
                 passdb/login_cache.o  passdb/pdb_smbpasswd.o passdb/pdb_tdb.o \
                 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
@@ -640 +640 @@
                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 \
@@ -694 +694 @@
            web/swat.o web/neg_lang.o
 
-SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
+SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
            $(LOCKING_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(KRBCLIENT_OBJ) \
            $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
@@ -842 +842 @@
           $(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) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) \
@@ -1012 +1012 @@
                 $(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) \
@@ -1077 +1077 @@
 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) \
@@ -1154 +1154 @@
         dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl
 
+PIDL = "$(srcdir)/pidl/pidl"
+
 idl::
-        @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
+        @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" PIDL="$(PIDL)"\
          srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
 
@@ -1455 +1457 @@
         @echo Linking $@
         @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
-                $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+                $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
                 $(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
                  $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
@@ -1561 +1563 @@
 $(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
         @rm -f $@
-        @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
+        @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
@@ -1581 +1583 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
         -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
         fi
@@ -1627 +1629 @@
 $(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
         @rm -f $@
-        @ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
+        @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
@@ -1648 +1650 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
         -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
         fi
@@ -1701 +1703 @@
 $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
         @rm -f $@
-        @ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
+        @ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
 
 $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
@@ -1721 +1723 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
         -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
         fi
@@ -1762 +1764 @@
 $(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
         @rm -f $@
-        @ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
+        @ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
 
 $(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
@@ -1781 +1783 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
         -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
         fi
@@ -1841 +1843 @@
 $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
         @rm -f $@
-        @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
+        @ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
 $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
@@ -1861 +1863 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
         -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
         fi
@@ -1922 +1924 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
         -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
         fi
@@ -1974 +1976 @@
 $(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
         @rm -f $@
-        @ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
+        @ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
 
 $(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
@@ -1993 +1995 @@
         @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
         -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
-                ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
+                ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
                         $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
         fi