diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
| commit | b967afca648eea481e586f367f99464418cf8468 (patch) | |
| tree | 3fbe9cc92a21013cbd1eb2b6fa1b73ccddfbb151 /source4/lib/charset | |
| parent | 9cd04363f56ba5ee4f8b1ffaf662fe81cc995e99 (diff) | |
| parent | afaba23131dc079be3cd92e87495ec8b2ebdc4ae (diff) | |
| download | samba-b967afca648eea481e586f367f99464418cf8468.tar.gz samba-b967afca648eea481e586f367f99464418cf8468.tar.bz2 samba-b967afca648eea481e586f367f99464418cf8468.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)
Diffstat (limited to 'source4/lib/charset')
| -rw-r--r-- | source4/lib/charset/config.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 2766784c52..e5e5bd4560 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -1,15 +1,12 @@ ################################################ # Start SUBSYSTEM CHARSET [SUBSYSTEM::CHARSET] -OBJ_FILES = \ - iconv.o \ - charcnv.o \ - util_unistr.o PRIVATE_PROTO_HEADER = charset_proto.h PUBLIC_DEPENDENCIES = ICONV PRIVATE_DEPENDENCIES = DYNCONFIG # End SUBSYSTEM CHARSET ################################################ +CHARSET_OBJ_FILES = $(addprefix lib/charset/, iconv.o charcnv.o util_unistr.o) PUBLIC_HEADERS += lib/charset/charset.h |