diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-28 11:41:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-28 05:30:20 +0200 |
| commit | 0df4061cffd32d4a989c5fd177136c2cc3730e7c (patch) | |
| tree | 9fe0a4411d4079072458801a9ad4825930801f51 /source3/Makefile.in | |
| parent | ea95e0967b33d75acc960b5308a667e956ba4f29 (diff) | |
| download | samba-0df4061cffd32d4a989c5fd177136c2cc3730e7c.tar.gz samba-0df4061cffd32d4a989c5fd177136c2cc3730e7c.tar.xz samba-0df4061cffd32d4a989c5fd177136c2cc3730e7c.zip | |
lib/util/charset Merge talloc-based pull and push charset functions
These were copied from source3/lib/charcnv.c
Andrew Bartlett
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ae275f808c6..4ec1868341f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -446,7 +446,9 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/util_transfer_file.o ../lib/async_req/async_sock.o \ lib/addrchange.o \ $(TDB_LIB_OBJ) \ - $(VERSION_OBJ) lib/charcnv.o ../lib/util/charset/convert_string.o lib/fstring.o ../lib/util/debug.o ../lib/util/debug_s3.o ../lib/util/fault.o \ + $(VERSION_OBJ) lib/charcnv.o ../lib/util/charset/convert_string.o \ + ../lib/util/charset/pull_push.o \ + lib/fstring.o ../lib/util/debug.o ../lib/util/debug_s3.o ../lib/util/fault.o \ lib/interface.o lib/pidfile.o lib/dumpcore.o \ lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \ lib/username.o \ |