Index: mupdf-1.10a-source/Makefile =================================================================== --- mupdf-1.10a-source.orig/Makefile +++ mupdf-1.10a-source/Makefile @@ -83,13 +83,13 @@ PDF_HDR := include/mupdf/pdf.h $(wildcar SVG_HDR := include/mupdf/svg.h HTML_HDR := include/mupdf/html.h -FITZ_SRC := $(wildcard source/fitz/*.c) -PDF_SRC := $(wildcard source/pdf/*.c) -XPS_SRC := $(wildcard source/xps/*.c) -SVG_SRC := $(wildcard source/svg/*.c) -CBZ_SRC := $(wildcard source/cbz/*.c) -HTML_SRC := $(wildcard source/html/*.c) -GPRF_SRC := $(wildcard source/gprf/*.c) +FITZ_SRC := $(sort $(wildcard source/fitz/*.c)) +PDF_SRC := $(sort $(wildcard source/pdf/*.c)) +XPS_SRC := $(sort $(wildcard source/xps/*.c)) +SVG_SRC := $(sort $(wildcard source/svg/*.c)) +CBZ_SRC := $(sort $(wildcard source/cbz/*.c)) +HTML_SRC := $(sort $(wildcard source/html/*.c)) +GPRF_SRC := $(sort $(wildcard source/gprf/*.c)) FITZ_SRC_HDR := $(wildcard source/fitz/*.h) PDF_SRC_HDR := $(wildcard source/pdf/*.h) source/pdf/pdf-name-table.h @@ -116,11 +116,11 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $( # --- Generated embedded font files --- -FONT_BIN_DROID := $(wildcard resources/fonts/droid/*.ttf) -FONT_BIN_NOTO := $(wildcard resources/fonts/noto/*.ttf) -FONT_BIN_HAN := $(wildcard resources/fonts/han/*.otf) -FONT_BIN_URW := $(wildcard resources/fonts/urw/*.cff) -FONT_BIN_SIL := $(wildcard resources/fonts/sil/*.cff) +FONT_BIN_DROID := $(sort $(wildcard resources/fonts/droid/*.ttf)) +FONT_BIN_NOTO := $(sort $(wildcard resources/fonts/noto/*.ttf)) +FONT_BIN_HAN := $(sort $(wildcard resources/fonts/han/*.otf)) +FONT_BIN_URW := $(sort $(wildcard resources/fonts/urw/*.cff)) +FONT_BIN_SIL := $(sort $(wildcard resources/fonts/sil/*.cff)) FONT_GEN_DROID := $(subst resources/fonts/droid/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_DROID)))) FONT_GEN_NOTO := $(subst resources/fonts/noto/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_NOTO)))) @@ -210,10 +210,10 @@ 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/*) +CMAP_CNS_SRC := $(sort $(wildcard resources/cmaps/cns/*)) +CMAP_GB_SRC := $(sort $(wildcard resources/cmaps/gb/*)) +CMAP_JAPAN_SRC := $(sort $(wildcard resources/cmaps/japan/*)) +CMAP_KOREA_SRC := $(sort $(wildcard resources/cmaps/korea/*)) $(GEN)/gen_cmap_cns.h : $(CMAP_CNS_SRC) $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CNS_SRC)