diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 10:24:58 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:00 +1100 |
| commit | 8afc271e2a9950fda68e99928746623093cbd6ac (patch) | |
| tree | e2a685a3929cea74a5d1b7f09ca6508e2b60fa30 /source3/Makefile.in | |
| parent | bed374215ff040cc995659d42938be35412a794a (diff) | |
| download | samba-8afc271e2a9950fda68e99928746623093cbd6ac.tar.gz samba-8afc271e2a9950fda68e99928746623093cbd6ac.tar.bz2 samba-8afc271e2a9950fda68e99928746623093cbd6ac.zip | |
lib/util/charset Use top level iconv.c in source3
The two files were very similar already, the only change required was
to adopt the s3 module registration fucntion name.
(NTSTATUS wasn't used as the charset code does not otherwise use that
type).
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f037314247..686d04c0fe 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -458,7 +458,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/ms_fnmatch.o lib/errmap_unix.o \ lib/tallocmsg.o lib/dmallocmsg.o \ libsmb/clisigning.o libsmb/smb_signing.o \ - lib/iconv.o intl/lang_tdb.o \ + ../lib/util/charset/iconv.o intl/lang_tdb.o \ lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \ lib/sessionid_tdb.o \ lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \ |