diff options
Diffstat (limited to 'xorg-server/fonts.src/misc/Makefile.am')
-rw-r--r-- | xorg-server/fonts.src/misc/Makefile.am | 158 |
1 files changed, 53 insertions, 105 deletions
diff --git a/xorg-server/fonts.src/misc/Makefile.am b/xorg-server/fonts.src/misc/Makefile.am index 340bcd5de..b5c7350db 100644 --- a/xorg-server/fonts.src/misc/Makefile.am +++ b/xorg-server/fonts.src/misc/Makefile.am @@ -20,7 +20,6 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. BDF2UCS_FONT_FILES = \ - clR6x12 \ 4x6 \ 5x7 \ 5x8 \ @@ -95,159 +94,99 @@ EXTRA_FONT_FILES = \ 18x18ja \ 18x18ko \ k14 \ - nil2 \ - micro \ - jiskan16 \ - jiskan24 \ - gb16fs \ - gb16st \ - gb24st \ - deccurs \ - decsess \ - arabic24 \ - cursor \ - hanglg16 \ - hanglm16 \ - hanglm24 \ - cu12 \ - cu-alt12 \ - cu-arabic12 \ - cuarabic12 \ - cu-devnag12 \ - cudevnag12 \ - cu-lig12 \ - cu-pua12 \ - clB6x10 \ - clB6x12 \ - clB8x10 \ - clB8x12 \ - clB8x13 \ - clB8x14 \ - clB8x16 \ - clB8x8 \ - clB9x15 \ - clI6x12 \ - clI8x8 \ - clR4x6 \ - clR5x10 \ - clR5x6 \ - clR5x8 \ - clR6x10 \ - clR6x13 \ - clR6x6 \ - clR6x8 \ - clR7x10 \ - clR7x12 \ - clR7x14 \ - clR7x8 \ - clR8x10 \ - clR8x12 \ - clR8x13 \ - clR8x14 \ - clR8x16 \ - clR8x8 \ - clR9x15 \ - 12x24 \ - 12x24rk \ - 8x16 \ - 8x16rk \ - olcursor \ - olgl10 \ - olgl12 \ - olgl14 \ - olgl19 + nil2 FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES) TRUNC_FONT_FILES = $(BDF2UCS_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) TRUNC_BDF_FILES = $(TRUNC_FONT_FILES:%=%t.bdf) -TRUNC_PCF_FILES = $(TRUNC_FONT_FILES:%=%.pcf.gz) +TRUNC_PCF_FILES = $(TRUNC_FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_5 ISO8859_5_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.bdf) -ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf.gz) +ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_7 ISO8859_7_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.bdf) -ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf.gz) +ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_8 ISO8859_8_BDF_FILES = $(BDF2UCS_8_FONT_FILES:%=%-ISO8859-8.bdf) -ISO8859_8_PCF_FILES = $(BDF2UCS_8_FONT_FILES:%=%-ISO8859-8.pcf.gz) +ISO8859_8_PCF_FILES = $(BDF2UCS_8_FONT_FILES:%=%-ISO8859-8.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_11 ISO8859_11_BDF_FILES = $(BDF2UCS_11_FONT_FILES:%=%-ISO8859-11.bdf) -ISO8859_11_PCF_FILES = $(BDF2UCS_11_FONT_FILES:%=%-ISO8859-11.pcf.gz) +ISO8859_11_PCF_FILES = $(BDF2UCS_11_FONT_FILES:%=%-ISO8859-11.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_16 ISO8859_16_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.bdf) -ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf.gz) +ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf$(COMPRESS_SUFFIX)) endif if KOI8_R KOI8_R_BDF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=%-KOI8-R.bdf) -KOI8_R_PCF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=%-KOI8-R.pcf.gz) +KOI8_R_PCF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=%-KOI8-R.pcf$(COMPRESS_SUFFIX)) endif if JISX0201 JISX0201_BDF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=%-JISX0201.1976-0.bdf) -JISX0201_PCF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=%-JISX0201.1976-0.pcf.gz) +JISX0201_PCF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=%-JISX0201.1976-0.pcf$(COMPRESS_SUFFIX)) endif UTIL_DIR = @MAPFILES_PATH@ -SUFFIXES = .bdf .pcf.gz t.bdf \ +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) t.bdf \ -ISO8859-1.bdf \ -ISO8859-2.bdf \ -ISO8859-3.bdf \ @@ -265,81 +204,81 @@ SUFFIXES = .bdf .pcf.gz t.bdf \ -KOI8-R.bdf \ -JISX0201.1976-0.bdf -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ .bdft.bdf: @rm -f $@ - $(PERL) $(BDFTRUNCATE) 0x3200 < $< > $@ + $(BDFTRUNCATE) 0x3200 < $< > $@ .bdf-ISO8859-1.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 .bdf-ISO8859-2.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 .bdf-ISO8859-3.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 .bdf-ISO8859-4.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 .bdf-ISO8859-5.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-5 ISO8859-5 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-5 ISO8859-5 .bdf-ISO8859-7.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-7 ISO8859-7 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-7 ISO8859-7 .bdf-ISO8859-8.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-8 ISO8859-8 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-8 ISO8859-8 .bdf-ISO8859-9.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 .bdf-ISO8859-10.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 .bdf-ISO8859-11.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-11 ISO8859-11 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-11 ISO8859-11 .bdf-ISO8859-13.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 .bdf-ISO8859-14.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 .bdf-ISO8859-15.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 .bdf-ISO8859-16.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-16 ISO8859-16 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-16 ISO8859-16 .bdf-KOI8-R.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-KOI8-R KOI8-R + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-KOI8-R KOI8-R .bdf-JISX0201.1976-0.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-JISX0201.1976-0 JISX0201.1976-0 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-JISX0201.1976-0 JISX0201.1976-0 -t.bdf.pcf.gz: +t.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = \ @@ -380,15 +319,24 @@ BUILT_BDF_FILES = \ CLEANFILES = $(font_DATA) $(TRUNC_BDF_FILES) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) autogen.sh README uniarab.txt +EXTRA_DIST = $(BDF_FILES) all-local: $(BUILT_BDF_FILES) $(font_DATA) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog |