diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-02-23 15:00:56 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2015-02-23 15:00:56 +0100 |
| commit | 119552f74c71c24698f4b424411786bfb4baea6b (patch) | |
| tree | bf312c79c7fe6fcb819c6f1b8e3cc9f8e4888e0e /Makefile | |
| parent | 241f8b6c35895b932ac7f27de1ee76416cae419a (diff) | |
| parent | fe05bc51ee70190516d6cc65f03e343bfdc4f849 (diff) | |
| download | mupdf-119552f74c71c24698f4b424411786bfb4baea6b.tar.xz | |
Merge branch 'html'
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -66,6 +66,7 @@ ALL_DIR += $(OUT)/xps ALL_DIR += $(OUT)/cbz ALL_DIR += $(OUT)/img ALL_DIR += $(OUT)/tiff +ALL_DIR += $(OUT)/html ALL_DIR += $(OUT)/tools ALL_DIR += $(OUT)/platform/x11 ALL_DIR += $(OUT)/platform/x11/curl @@ -73,20 +74,24 @@ ALL_DIR += $(OUT)/platform/x11/curl FITZ_HDR := include/mupdf/fitz.h $(wildcard include/mupdf/fitz/*.h) PDF_HDR := include/mupdf/pdf.h $(wildcard include/mupdf/pdf/*.h) XPS_HDR := include/mupdf/xps.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) CBZ_SRC := $(wildcard source/cbz/*.c) +HTML_SRC := $(wildcard source/html/*.c) FITZ_SRC_HDR := $(wildcard source/fitz/*.h) PDF_SRC_HDR := $(wildcard source/pdf/*.h) XPS_SRC_HDR := $(wildcard source/xps/*.h) +HTML_SRC_HDR := $(wildcard source/html/*.h) FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC)))) PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC)))) XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC)))) CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) +HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC)))) # --- Choice of Javascript library --- @@ -114,12 +119,13 @@ $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR) $(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) $(XPS_OBJ) : $(FITZ_HDR) $(XPS_HDR) $(XPS_SRC_HDR) $(CBZ_OBJ) : $(FITZ_HDR) +$(HTML_OBJ) : $(FITZ_HDR) $(HTML_HDR) $(HTML_SRC_HDR) # --- Library --- MUPDF_LIB := $(OUT)/libmupdf.a -$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) +$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) INSTALL_LIBS := $(MUPDF_LIB) |