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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

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

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

@@ -127 +127 @@
 CONFIGFILE = $(CONFIGDIR)/smb.conf
 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-CTDBDIR = @ctdbdir@
 
 # This is where smbpasswd et al go
@@ -193 +192 @@
         bin/tdbtool@EXEEXT@
 BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
-        bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
+        bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
         bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
 BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
-        bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@
+        bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@
 
 TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
@@ -1082 +1081 @@
 LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
 LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
+LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbrename.o
 
 WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
@@ -1203 +1203 @@
         nbt.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)
 
@@ -1511 +1513 @@
         @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) \
                 @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
@@ -1576 +1578 @@
         @echo Linking $@
         @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
+                $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+
+bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+        @echo Linking $@
+        @$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
                 $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
@@ -1617 +1625 @@
 $(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)
@@ -1637 +1645 @@
         @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
@@ -1683 +1691 @@
 $(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)
@@ -1704 +1712 @@
         @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
@@ -1758 +1766 @@
 $(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)
@@ -1778 +1786 @@
         @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
@@ -1819 +1827 @@
 $(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)
@@ -1838 +1846 @@
         @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
@@ -1905 +1913 @@
 $(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)
@@ -1925 +1933 @@
         @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
@@ -1989 +1997 @@
         @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
@@ -2042 +2050 @@
 $(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)
@@ -2061 +2069 @@
         @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