Merge branch 'master' of git://git.samba.org/samba into convenience

[kai/samba-autobuild/.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f1272559b74529c343b3250286aff9621df52677..abf6cfb5f7c76372be79e04886e6fa6b73045506 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -366,8 +366,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
          lib/substitute.o lib/dbwrap_util.o \
          lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
          lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
-         lib/iconv.o lib/pam_errors.o intl/lang_tdb.o lib/conn_tdb.o \
-         lib/adt_tree.o lib/gencache.o \
+         ../lib/util/charset/iconv.o lib/pam_errors.o intl/lang_tdb.o \
+         lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
          lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \
          lib/ldap_escape.o @CHARSET_STATIC@ \
          lib/secdesc.o lib/util_seaccess.o ../libcli/security/secace.o \