diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-02-05 05:57:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-02-05 05:57:24 +0000 |
| commit | 93693c4d820dac2f218e144f5126a5a761f1cfbf (patch) | |
| tree | 7371d326f24a3c9d73fed75e7792133d0d654a50 /iconv/Makefile | |
| parent | 377c725f8e2dba91af36af27206e6deb85cf6e6f (diff) | |
Update.
2001-02-04 Ulrich Drepper <drepper@redhat.com>
* iconv/Makefile (iconv_prog-modules): Define. Add vpath to find
files in locale/programs. Add CFLAGS definition to allow compiling
localedef files.
* iconv/dummy-repertoire.c: New file.
* iconv/iconv_charmap.c: New file.
* iconv/iconv_prog.h: New file.
* iconv/iconv_prog.c: Make verbose and omit_invalid global.
(main): If parameter for -f and -t contain slashes try first to resolve
the strings as filenames of charmap files. Use them for conversion
in this case.
* iconvdata/run-iconv-test.sh: If charmaps exist also run tests with
iconv getting charmap names as parameters.
* locale/programs/linereader.c (lr_token): Take extra parameters
verbose and pass it to get_string.
(get_string): Take extra parameters verbose.
* locale/programs/charmap.c (parse_charmap): Take extra parameters
verbose and be_quiet. Change all callers of lr_token and
parse_charmap.
* locale/programs/charmap.h: Likewise.
* locale/programs/ld-address.c: Likewise.
* locale/programs/ld-collate.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-identification.c: Likewise.
* locale/programs/ld-measurement.c: Likewise.
* locale/programs/ld-messages.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/ld-name.c: Likewise.
* locale/programs/ld-numeric.c: Likewise.
* locale/programs/ld-paper.c: Likewise.
* locale/programs/ld-telephone.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* locale/programs/linereader.c: Likewise.
* locale/programs/linereader.h: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locfile.c: Likewise.
* locale/programs/locfile.h: Likewise.
* locale/programs/repertoire.c: Likewise.
Diffstat (limited to 'iconv/Makefile')
| -rw-r--r-- | iconv/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index b6c4f23d5a..e92eb0bb39 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -34,9 +34,19 @@ CFLAGS-gconv_db.c = -DSTATIC_GCONV CFLAGS-gconv_simple.c = -DSTATIC_GCONV endif +vpath %.c ../locale/programs + +iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \ + dummy-repertoire simple-hash xstrdup xmalloc +CFLAGS-iconv_prog.c = -I../locale/programs +CFLAGS-iconv_charmap.c = -I../locale/programs +CFLAGS-dummy-repertoire.c = -I../locale/programs +CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ + -DDEFAULT_CHARMAP=null_pointer + tests = tst-iconv1 tst-iconv2 tst-iconv3 -distribute = gconv_builtin.h gconv_int.h loop.c skeleton.c +distribute = gconv_builtin.h gconv_int.h loop.c skeleton.c iconv_prog.h others = iconv_prog install-others = $(inst_bindir)/iconv @@ -47,3 +57,5 @@ include ../Rules $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) $(do-install-program) + +$(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) |