[Pkg-samba-maint] r2039 - in branches/samba/experimental: . debian debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Tue Jul 15 13:30:36 UTC 2008
Author: vorlon
Date: 2008-07-15 13:30:36 +0000 (Tue, 15 Jul 2008)
New Revision: 2039
Added:
branches/samba/experimental/debian/patches/proper-static-lib-linking.patch
Modified:
branches/samba/experimental/
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/series
Log:
* debian/patches/proper-static-lib-linking.patch: fix SMB_LIBRARY macro
and Makefile.in to properly avoid linking .a libraries into other .a
libraries, since this bloats the libraries without providing any useful
functionality.
Property changes on: branches/samba/experimental
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2007-11-12 13:56:56.803999901 -0800
committer: Steve Langasek <steve.langasek at canonical.com>
properties:
branch-nick: samba.deb
+ timestamp: 2008-07-15 14:30:26.680999994 +0100
committer: Steve Langasek <vorlon at debian.org>
properties:
branch-nick: samba.experimental
Name: bzr:file-ids
- debian/patches/usershare.patch usershare.patch-20071111022404-m4t5puq5wxrkqa1p-1
debian/patches/get_global_sam_sid-non-root.patch get_global_sam_sidno-20071111002251-yyz8h314qolu25gg-1
+ debian/patches/proper-static-lib-linking.patch properstaticliblinki-20080715132058-j0oqabvjmclqoj4k-1
Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWTAzeBkAAA5RgAAQABC6yR4AIAAxTAAA0nqA9RtJaDAREhvTa9c1PHSHfi7kinChIGBm8DI.
+ 293 vorlon at debian.org-20080715133026-31uraqlmmuwlur9y
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2008-07-15 11:25:34 UTC (rev 2038)
+++ branches/samba/experimental/debian/changelog 2008-07-15 13:30:36 UTC (rev 2039)
@@ -1,3 +1,12 @@
+samba (2:3.2.0-2ubuntu1) UNRELEASED; urgency=low
+
+ * debian/patches/proper-static-lib-linking.patch: fix SMB_LIBRARY macro
+ and Makefile.in to properly avoid linking .a libraries into other .a
+ libraries, since this bloats the libraries without providing any useful
+ functionality.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Tue, 15 Jul 2008 12:33:54 +0100
+
samba (2:3.2.0-2) experimental; urgency=low
* Fix up the copyright file to correctly document that we're now under
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2008-07-15 11:25:34 UTC (rev 2038)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2008-07-15 13:30:36 UTC (rev 2039)
@@ -25,11 +25,31 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-3.2.0rc1/source/configure
+Index: samba.experimental/source/configure
===================================================================
---- samba-3.2.0rc1.orig/source/configure
-+++ samba-3.2.0rc1/source/configure
-@@ -2220,7 +2220,7 @@
+--- samba.experimental.orig/source/configure
++++ samba.experimental/source/configure
+@@ -799,16 +799,19 @@
+ LIBTALLOC_SHARED
+ LIBTALLOC_STATIC
+ LIBTALLOC_LIBS
++LIBTALLOC_TARGET
+ LIBTDB_SHARED_TARGET
+ LIBTDB_STATIC_TARGET
+ LIBTDB_SHARED
+ LIBTDB_STATIC
+ LIBTDB_LIBS
++LIBTDB_TARGET
+ LIBNETAPI_SHARED_TARGET
+ LIBNETAPI_STATIC_TARGET
+ LIBNETAPI_SHARED
+ LIBNETAPI_STATIC
+ LIBNETAPI_LIBS
++LIBNETAPI_TARGET
+ WINBIND_NSS_PTHREAD
+ WINBIND_NSS
+ WINBIND_WINS_NSS
+@@ -2220,7 +2223,7 @@
if test "${with_fhs+set}" = set; then
withval=$with_fhs; case "$withval" in
yes)
@@ -38,7 +58,7 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -2228,9 +2228,9 @@
+@@ -2228,9 +2231,9 @@
test "${libdir}" || libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
@@ -50,7 +70,7 @@
cat >>confdefs.h <<\_ACEOF
#define FHS_COMPATIBLE 1
-@@ -13048,6 +13048,27 @@
+@@ -13048,6 +13051,27 @@
fi
;;
@@ -78,7 +98,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -40492,7 +40513,7 @@
+@@ -40492,7 +40516,7 @@
#
#
case "$host_os" in
@@ -87,7 +107,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -45494,11 +45515,14 @@
+@@ -45494,11 +45518,14 @@
# and these are for particular systems
case "$host_os" in
@@ -104,7 +124,109 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -68756,7 +68780,7 @@
+@@ -66424,7 +66451,9 @@
+ LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
+ LIBTALLOC_SHARED=
+ LIBTALLOC_STATIC=
+-LIBTALLOC_LIBS=
++LIBTALLOC_LIBS=-ltalloc
++LIBTALLOC_TARGET=
++
+
+
+
+@@ -66458,17 +66487,20 @@
+ fi
+
+
++
+ if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
+ LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
++ LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
+ LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET
+- else
+- LIBTALLOC_LIBS=-ltalloc
++ LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
++ LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
+ fi
+ else
+ enable_static=yes
++ LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
+ { echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+ echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
+ fi
+@@ -66490,7 +66522,9 @@
+ LIBTDB_STATIC_TARGET=bin/libtdb.a
+ LIBTDB_SHARED=
+ LIBTDB_STATIC=
+-LIBTDB_LIBS=
++LIBTDB_LIBS=-ltdb
++LIBTDB_TARGET=
++
+
+
+
+@@ -66524,17 +66558,20 @@
+ fi
+
+
++
+ if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
+ LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
++ LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
+ LIBTDB_STATIC=$LIBTDB_STATIC_TARGET
+- else
+- LIBTDB_LIBS=-ltdb
++ LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
++ LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
+ fi
+ else
+ enable_static=yes
++ LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
+ { echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+ echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
+ fi
+@@ -66556,7 +66593,9 @@
+ LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
+ LIBNETAPI_SHARED=
+ LIBNETAPI_STATIC=
+-LIBNETAPI_LIBS=
++LIBNETAPI_LIBS=-lnetapi
++LIBNETAPI_TARGET=
++
+
+
+
+@@ -66590,17 +66629,20 @@
+ fi
+
+
++
+ if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
+ LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
++ LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
+ LIBNETAPI_STATIC=$LIBNETAPI_STATIC_TARGET
+- else
+- LIBNETAPI_LIBS=-lnetapi
++ LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
++ LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
+ fi
+ else
+ enable_static=yes
++ LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
+ { echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+ echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
+ fi
+@@ -68756,7 +68798,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -113,7 +235,7 @@
{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -69964,11 +69988,11 @@
+@@ -69964,11 +70006,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
@@ -127,10 +249,49 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-Index: samba-3.2.0rc1/source/include/config.h.in
+@@ -75846,17 +75888,17 @@
+ LIBTALLOC_SHARED!$LIBTALLOC_SHARED$ac_delim
+ LIBTALLOC_STATIC!$LIBTALLOC_STATIC$ac_delim
+ LIBTALLOC_LIBS!$LIBTALLOC_LIBS$ac_delim
++LIBTALLOC_TARGET!$LIBTALLOC_TARGET$ac_delim
+ LIBTDB_SHARED_TARGET!$LIBTDB_SHARED_TARGET$ac_delim
+ LIBTDB_STATIC_TARGET!$LIBTDB_STATIC_TARGET$ac_delim
+ LIBTDB_SHARED!$LIBTDB_SHARED$ac_delim
+ LIBTDB_STATIC!$LIBTDB_STATIC$ac_delim
+ LIBTDB_LIBS!$LIBTDB_LIBS$ac_delim
++LIBTDB_TARGET!$LIBTDB_TARGET$ac_delim
+ LIBNETAPI_SHARED_TARGET!$LIBNETAPI_SHARED_TARGET$ac_delim
+ LIBNETAPI_STATIC_TARGET!$LIBNETAPI_STATIC_TARGET$ac_delim
+ LIBNETAPI_SHARED!$LIBNETAPI_SHARED$ac_delim
+ LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
+-LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
+-WINBIND_NSS_PTHREAD!$WINBIND_NSS_PTHREAD$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -75898,6 +75940,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
++LIBNETAPI_TARGET!$LIBNETAPI_TARGET$ac_delim
++WINBIND_NSS_PTHREAD!$WINBIND_NSS_PTHREAD$ac_delim
+ WINBIND_NSS!$WINBIND_NSS$ac_delim
+ WINBIND_WINS_NSS!$WINBIND_WINS_NSS$ac_delim
+ WINBIND_NSS_LDSHFLAGS!$WINBIND_NSS_LDSHFLAGS$ac_delim
+@@ -75931,7 +75976,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+Index: samba.experimental/source/include/config.h.in
===================================================================
---- samba-3.2.0rc1.orig/source/include/config.h.in
-+++ samba-3.2.0rc1/source/include/config.h.in
+--- samba.experimental.orig/source/include/config.h.in
++++ samba.experimental/source/include/config.h.in
@@ -66,6 +66,9 @@
/* Whether to use fully FHS-compatible paths */
#undef FHS_COMPATIBLE
Added: branches/samba/experimental/debian/patches/proper-static-lib-linking.patch
===================================================================
--- branches/samba/experimental/debian/patches/proper-static-lib-linking.patch (rev 0)
+++ branches/samba/experimental/debian/patches/proper-static-lib-linking.patch 2008-07-15 13:30:36 UTC (rev 2039)
@@ -0,0 +1,563 @@
+=== modified file 'source/Makefile.in'
+Index: samba.experimental/source/Makefile.in
+===================================================================
+--- samba.experimental.orig/source/Makefile.in
++++ samba.experimental/source/Makefile.in
+@@ -255,7 +255,7 @@
+ TDB_OBJ = lib/util_tdb.o \
+ lib/dbwrap.o lib/dbwrap_tdb.o \
+ lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \
+- lib/dbwrap_rbt.o @LIBTDB_STATIC@
++ lib/dbwrap_rbt.o
+
+ SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
+
+@@ -321,8 +321,7 @@
+ LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
+ LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
+
+-LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
+- $(LIBREPLACE_OBJ) \
++LIBSAMBAUTIL_OBJ = $(LIBREPLACE_OBJ) \
+ $(SOCKET_WRAPPER_OBJ) \
+ $(NSS_WRAPPER_OBJ)
+
+@@ -374,7 +373,7 @@
+
+ LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
+ libaddns/dnsgss.o libaddns/dnsmarshall.o
+-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
++LIBADDNS_OBJ = $(LIBADDNS_OBJ0)
+
+ LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
+ nsswitch/libwbclient/wbc_util.o \
+@@ -384,7 +383,7 @@
+ nsswitch/libwbclient/wbc_pam.o
+ LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
+ $(WBCOMMON_OBJ) \
+- @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ)
++ $(LIBREPLACE_OBJ)
+
+ LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
+ libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
+@@ -814,7 +813,7 @@
+
+ LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@
+
+-LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@
++LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o
+
+ # This shared library is intended for linking with unit test programs
+ # to test Samba internals. It's called libbigballofmud.so to
+@@ -1114,15 +1113,15 @@
+ iniparser_build/strlib.o
+
+ TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
+- @LIBTDB_STATIC@ $(SOCKET_WRAPPER_OBJ)
++ $(SOCKET_WRAPPER_OBJ)
+
+-TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
++TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o $(LIBREPLACE_OBJ) \
+ $(SOCKET_WRAPPER_OBJ)
+
+-TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
++TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o $(LIBREPLACE_OBJ) \
+ $(SOCKET_WRAPPER_OBJ)
+
+-TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
++TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \
+ $(SOCKET_WRAPPER_OBJ)
+
+
+@@ -1319,7 +1318,7 @@
+ dir=bin $(MAKEDIR); fi
+ @: >> $@ || : > $@ # what a fancy emoticon!
+
+-bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
++bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
+ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+@@ -1327,45 +1326,45 @@
+ @POPTLIBS@ @SMBD_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+ @WINBIND_LIBS@
+
+-bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @POPTLIBS@ \
+ $(KRB5LIBS) $(LDAP_LIBS)
+
+-bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
+ $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) \
+ $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
+ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
+ $(KRB5LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+ @WINBIND_LIBS@
+
+-bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
++bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
+ $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
+ @INIPARSERLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@
+
+-bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+@@ -1378,135 +1377,135 @@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
+
+-bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \
+ -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) \
+ $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ \
+ @LIBTDB_LIBS@
+
+-bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
+ $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
+ $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ \
+ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ @POPTLIBS@ $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ \
+ @LIBTDB_LIBS@
+
+-bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
+ $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
++bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
+- $(DYNEXP) $(LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@
++ $(DYNEXP) $(LIBS) @POPTLIBS@
+
+-bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
+ $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
+ @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@
+
+-bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
+ $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+@@ -1514,64 +1513,64 @@
+ @SMBD_LIBS@ $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+ @LIBWBCLIENT_SHARED@
+
+-bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
+ $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
++bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
+ @POPTLIBS@ $(LIBS) @LIBTALLOC_LIBS@
+
+-bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ @POPTLIBS@ @LDAP_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
++bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(LIBS) @LIBTALLOC_LIBS@
+
+-bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
+ $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
+@@ -1608,7 +1607,7 @@
+ $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
+ @$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
+
+-$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
++$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_TARGET@
+ @echo Linking shared library $@
+ @$(SHLD_DSO) @LIBTALLOC_LIBS@ $(LIBWBCLIENT_OBJ) \
+ @SONAMEFLAG@`basename $@`.$(SONAME_VER)
+@@ -1618,7 +1617,7 @@
+ @echo Linking non-shared library $@
+ @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
+
+-bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@
++bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_TARGET@
+ @echo Linking shared library $@
+ @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
+ $(KRB5LIBS) $(UUID_LIBS) @LIBTALLOC_LIBS@ \
+@@ -1631,7 +1630,7 @@
+ $(LIBNETAPI_SYMS): $(LIBNETAPI_HEADERS)
+ @$(MKSYMS_SH) $(AWK) $@ $(LIBNETAPI_HEADERS)
+
+-$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking shared library $@
+ @$(SHLD_DSO) $(LIBNETAPI_OBJ) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \
+@@ -1643,7 +1642,7 @@
+ @echo Linking non-shared library $@
+ @-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
+
+-bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking shared library $@
+ @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \
+@@ -1654,7 +1653,7 @@
+ @echo Linking non-shared library $@
+ @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
+
+-bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking shared library $@
+ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
+ $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+@@ -1666,10 +1665,10 @@
+ @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
+
+ # This is probably wrong for anything other than the GNU linker.
+-bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@
++bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking shared library $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
+- $(LIBS) @LIBTALLOC_LIBS@ \
++ $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
+ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
+ ln -snf libbigballofmud.so bin/libbigballofmud.so.0
+@@ -1747,13 +1746,13 @@
+ @echo "Linking $@"
+ @$(SHLD_MODULE) $(RPC_ECHO_OBJ)
+
+-bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo "Linking $@"
+ @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \
+ $(PASSDB_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo "Linking $@"
+ @$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
+ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
+@@ -1766,7 +1765,7 @@
+ @WINBIND_NSS_EXTRA_LIBS@ @WINBIND_NSS_PTHREAD@ \
+ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+
+- at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++ at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo "Linking $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+@@ -2003,55 +2002,55 @@
+ ## None here right now
+ #########################################################
+
+-bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
+ $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
+ @WINBIND_LIBS@
+
+ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
+- $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
++ $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @LIBTDB_SHARED@
++bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_TARGET@ @LIBWBCLIENT_SHARED@ @LIBTDB_TARGET@
+ @echo "Linking shared library $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
+ $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+-bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
+- $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
++ $(LIBS) @LIBTDB_LIBS@
+
+-bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
+ $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \
+ $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+
+-bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
++bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTDB_TARGET@
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
+- $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
++ $(LIBS) @LIBTDB_LIBS@
+
+-bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
++bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
+ $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ \
+ torture/t_strcmp.o -L ./bin -lbigballofmud
+
+-bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o
++bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o
+ $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ \
+ torture/t_strstr.o -L ./bin -lbigballofmud
+
+-bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o
++bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o
+ $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ \
+ torture/t_strappend.o -L ./bin -lbigballofmud
+
+Index: samba.experimental/source/m4/aclocal.m4
+===================================================================
+--- samba.experimental.orig/source/m4/aclocal.m4
++++ samba.experimental/source/m4/aclocal.m4
+@@ -68,13 +68,15 @@
+ LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
+ LIBUC[_SHARED]=
+ LIBUC[_STATIC]=
+-LIBUC[_LIBS]=
++LIBUC[_LIBS]=LIBLIBS
++LIBUC[_TARGET]=
+
+ AC_SUBST(LIBUC[_SHARED_TARGET])
+ AC_SUBST(LIBUC[_STATIC_TARGET])
+ AC_SUBST(LIBUC[_SHARED])
+ AC_SUBST(LIBUC[_STATIC])
+ AC_SUBST(LIBUC[_LIBS])
++AC_SUBST(LIBUC[_TARGET])
+
+ AC_MSG_CHECKING([whether to build the LIBNAME shared library])
+ AC_ARG_WITH(LIBNAME,
+@@ -97,16 +99,19 @@
+ ]
+ )
+
++
+ if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
+ LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
++ LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET]
+ AC_MSG_RESULT(yes)
+ if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
+ LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
+- else
+- LIBUC[_LIBS]=LIBLIBS
++ LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
++ LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
+ fi
+ else
+ enable_static=yes
++ LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
+ AC_MSG_RESULT(no shared library support -- will supply static library)
+ fi
+ if test $enable_static = yes; then
Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series 2008-07-15 11:25:34 UTC (rev 2038)
+++ branches/samba/experimental/debian/patches/series 2008-07-15 13:30:36 UTC (rev 2039)
@@ -10,6 +10,7 @@
undefined-symbols.patch
VERSION.patch
adapt_machine_creation_script.patch
+proper-static-lib-linking.patch
autoconf.patch
smbpasswd-syslog.patch
usershare.patch
More information about the Pkg-samba-maint
mailing list