From 5dd383a4eb03c05f0e34fd166c133d567d66de3d Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Wed, 4 Apr 2018 16:54:50 +0200
Subject: Check in generated CMap source.

Created with the 'scripts/runcmapdump.sh' script.
---
 Makefile | 51 +++++----------------------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b92f8f32..1017e238 100644
--- a/Makefile
+++ b/Makefile
@@ -239,56 +239,15 @@ generate: $(ICC_GEN)
 
 # --- Generated CMap files ---
 
-CMAPDUMP_EXE := $(OUT)/scripts/cmapdump.exe
-
-CMAP_CJK_SRC := $(sort $(wildcard resources/cmaps/cjk/*))
-CMAP_EXTRA_SRC := $(sort $(wildcard resources/cmaps/extra/*))
-CMAP_UTF8_SRC := $(sort $(wildcard resources/cmaps/utf8/*))
-CMAP_UTF32_SRC := $(sort $(wildcard resources/cmaps/utf32/*))
-
-CMAP_GEN := \
-	generated/pdf-cmap-cjk.c \
-	generated/pdf-cmap-extra.c \
-	generated/pdf-cmap-utf8.c \
-	generated/pdf-cmap-utf32.c
-CMAP_OBJ := $(CMAP_GEN:%.c=$(OUT)/%.o)
-
-generated/pdf-cmap-cjk.c : $(CMAP_CJK_SRC) | generated
-	$(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_CJK_SRC)
-generated/pdf-cmap-extra.c : $(CMAP_EXTRA_SRC) | generated
-	$(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_EXTRA_SRC)
-generated/pdf-cmap-utf8.c : $(CMAP_UTF8_SRC) | generated
-	$(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_UTF8_SRC)
-generated/pdf-cmap-utf32.c : $(CMAP_UTF32_SRC) | generated
-	$(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_UTF32_SRC)
-
-$(CMAP_OBJ) : $(CMAP_GEN)
+CMAP_GEN := $(notdir $(sort $(wildcard resources/cmaps/*)))
+CMAP_GEN := $(CMAP_GEN:%=source/pdf/cmaps/%.h)
 
-ifneq "$(CROSSCOMPILE)" "yes"
-$(CMAP_GEN) : $(CMAPDUMP_EXE)
-endif
+source/pdf/cmaps/%.h: resources/cmaps/%
+	$(MKTGTDIR)
+	$(QUIET_GEN) python scripts/cmapdump.py > $@ $<
 
 generate: $(CMAP_GEN)
 
-$(OUT)/scripts/cmapdump.o : \
-	$(NAME_GEN) \
-	include/mupdf/pdf/cmap.h \
-	source/fitz/context.c \
-	source/fitz/error.c \
-	source/fitz/memory.c \
-	source/fitz/output.c \
-	source/fitz/string.c \
-	source/fitz/buffer.c \
-	source/fitz/stream-open.c \
-	source/fitz/stream-read.c \
-	source/fitz/strtof.c \
-	source/fitz/ftoa.c \
-	source/fitz/printf.c \
-	source/fitz/time.c \
-	source/pdf/pdf-lex.c \
-	source/pdf/pdf-cmap.c \
-	source/pdf/pdf-cmap-parse.c \
-
 # --- Generated embedded javascript files ---
 
 JAVASCRIPT_SRC := source/pdf/pdf-js-util.js
-- 
cgit v1.2.3