diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | encodings/Makefile.am | 52 | ||||
| -rw-r--r-- | encodings/large/Makefile.am | 32 |
4 files changed, 1 insertions, 103 deletions
diff --git a/Makefile.am b/Makefile.am index 4129ff1..ad9f262 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -SUBDIRS = src encodings +SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontenc.pc diff --git a/configure.ac b/configure.ac index c98da5b..28baff1 100644 --- a/configure.ac +++ b/configure.ac @@ -33,22 +33,6 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_LIBTOOL -# mkfontscale - -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -if [[ -z $MKFONTSCALE ]]; then - AC_MSG_ERROR([mkfontscale is needed to build fontenc. FIXME: when we - know where it is going to live, put a more informative - comment here]) -fi - -# gzip - -AC_PATH_PROG(GZIP, gzip) -if [[ -z $GZIP ]]; then - AC_MSG_ERROR([gzip is needed to compress font encodings]) -fi - # zlib AC_CHECK_LIB(z, gzclose) @@ -60,7 +44,5 @@ AC_SUBST(DEP_CFLAGS) AC_SUBST(DEP_LIBS) AC_OUTPUT([Makefile - encodings/Makefile - encodings/large/Makefile src/Makefile fontenc.pc]) diff --git a/encodings/Makefile.am b/encodings/Makefile.am deleted file mode 100644 index 9e88c98..0000000 --- a/encodings/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -SUBDIRS = large - -encodingsdir = $(libdir)/X11/fonts/encodings - -ENCODING_FILES = \ - adobe-dingbats.enc \ - adobe-standard.enc \ - adobe-symbol.enc \ - ansi-1251.enc \ - armscii-8.enc \ - ascii-0.enc \ - dec-special.enc \ - ibm-cp437.enc \ - ibm-cp850.enc \ - ibm-cp852.enc \ - ibm-cp866.enc \ - iso8859-11.enc \ - iso8859-13.enc \ - iso8859-16.enc \ - iso8859-6.16.enc \ - iso8859-6.8x.enc \ - microsoft-cp1250.enc \ - microsoft-cp1251.enc \ - microsoft-cp1252.enc \ - microsoft-cp1253.enc \ - microsoft-cp1254.enc \ - microsoft-cp1255.enc \ - microsoft-cp1256.enc \ - microsoft-cp1257.enc \ - microsoft-cp1258.enc \ - microsoft-win3.1.enc \ - mulearabic-0.enc \ - mulearabic-1.enc \ - mulearabic-2.enc \ - mulelao-1.enc \ - suneu-greek.enc \ - tcvn-0.enc \ - tis620-2.enc \ - viscii1.1-1.enc - -EXTRA_DIST = $(ENCODING_FILES) - -COMPRESSED = $(foreach FILE, $(ENCODING_FILES), $(FILE).gz) - -$(COMPRESSED): %.enc.gz: %.enc - @GZIP@ -c < $< > $@ - -encodings.dir: - @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large . - -encodings_DATA = $(COMPRESSED) encodings.dir -CLEANFILES = $(COMPRESSED) encodings.dir diff --git a/encodings/large/Makefile.am b/encodings/large/Makefile.am deleted file mode 100644 index 9fb1642..0000000 --- a/encodings/large/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -encodingsdir = $(libdir)/X11/fonts/encodings/large - -ENCODING_FILES = \ - big5.eten-0.enc \ - big5hkscs-0.enc \ - cns11643-1.enc \ - cns11643-2.enc \ - cns11643-3.enc \ - gb18030-0.enc \ - gb18030.2000-0.enc \ - gb18030.2000-1.enc \ - gb2312.1980-0.enc \ - gbk-0.enc \ - jisx0201.1976-0.enc \ - jisx0208.1990-0.enc \ - jisx0212.1990-0.enc \ - ksc5601.1987-0.enc \ - ksc5601.1992-3.enc \ - sun.unicode.india-0.enc - -EXTRA_DIST = $(ENCODING_FILES) - -COMPRESSED = $(foreach FILE, $(ENCODING_FILES), $(FILE).gz) - -$(COMPRESSED): %.enc.gz: %.enc - @GZIP@ -c < $< > $@ - -encodings.dir: - @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . . - -encodings_DATA = $(COMPRESSED) encodings.dir -CLEANFILES = $(COMPRESSED) encodings.dir |