From 5c8bb19daaf6d83f1ed5d6abfd91bfecaf3e273a Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 16 Nov 2016 17:20:29 +0100 Subject: Rearrange CMap resources. Only include the ones that are used. Silences unused variable warnings on gcc. --- Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 886a0176..e4bb7301 100644 --- a/Makefile +++ b/Makefile @@ -210,21 +210,21 @@ NAMEDUMP := $(OUT)/namedump CQUOTE := $(OUT)/cquote BIN2HEX := $(OUT)/bin2hex -CMAP_CNS_SRC := $(wildcard resources/cmaps/cns/*) -CMAP_GB_SRC := $(wildcard resources/cmaps/gb/*) -CMAP_JAPAN_SRC := $(wildcard resources/cmaps/japan/*) -CMAP_KOREA_SRC := $(wildcard resources/cmaps/korea/*) - -$(GEN)/gen_cmap_cns.h : $(CMAP_CNS_SRC) - $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CNS_SRC) -$(GEN)/gen_cmap_gb.h : $(CMAP_GB_SRC) - $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_GB_SRC) -$(GEN)/gen_cmap_japan.h : $(CMAP_JAPAN_SRC) - $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_JAPAN_SRC) -$(GEN)/gen_cmap_korea.h : $(CMAP_KOREA_SRC) - $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_KOREA_SRC) - -CMAP_GEN := $(addprefix $(GEN)/, gen_cmap_cns.h gen_cmap_gb.h gen_cmap_japan.h gen_cmap_korea.h) +CMAP_CJK_SRC := $(wildcard resources/cmaps/cjk/*) +CMAP_EXTRA_SRC := $(wildcard resources/cmaps/extra/*) +CMAP_UTF8_SRC := $(wildcard resources/cmaps/utf8/*) +CMAP_UTF32_SRC := $(wildcard resources/cmaps/utf32/*) + +$(GEN)/gen_cmap_cjk.h : $(CMAP_CJK_SRC) + $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CJK_SRC) +$(GEN)/gen_cmap_extra.h : $(CMAP_EXTRA_SRC) + $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_EXTRA_SRC) +$(GEN)/gen_cmap_utf8.h : $(CMAP_UTF8_SRC) + $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_UTF8_SRC) +$(GEN)/gen_cmap_utf32.h : $(CMAP_UTF32_SRC) + $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_UTF32_SRC) + +CMAP_GEN := $(addprefix $(GEN)/, gen_cmap_cjk.h gen_cmap_extra.h gen_cmap_utf8.h gen_cmap_utf32.h) include/mupdf/pdf.h : include/mupdf/pdf/name-table.h NAME_GEN := include/mupdf/pdf/name-table.h source/pdf/pdf-name-table.h -- cgit v1.2.3