diff options
| -rw-r--r-- | Makefile | 91 | ||||
| -rw-r--r-- | Makethird | 10 |
2 files changed, 50 insertions, 51 deletions
@@ -14,7 +14,6 @@ default: all # set a variable that was set on the command line. CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iimage -Iucdn -Iscripts LIBS += $(XLIBS) -lm -LIBS_V8 = $(LIBS) $(V8LIBS) include Makerules include Makethird @@ -54,7 +53,6 @@ CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $< CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $< AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -LINK_V8_CMD = $(QUIET_LINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS_V8) MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ RM_CMD = $(QUIET_RM) rm -f $@ @@ -107,8 +105,8 @@ $(OUT)/%.o : apps/%.c $(FITZ_HDR) $(MUPDF_HDR) | $(OUT) # --- Fitz, MuPDF, MuXPS and MuCBZ library --- -FITZ_LIB := $(OUT)/libfitz.a -FITZ_V8_LIB := $(OUT)/libfitzv8.a +MUPDF_LIB := $(OUT)/libmupdf.a +MUPDF_V8_LIB := $(OUT)/libmupdf-v8.a FITZ_SRC := $(notdir $(wildcard fitz/*.c draw/*.c ucdn/*.c)) FITZ_SRC := $(filter-out draw_simple_scale.c, $(FITZ_SRC)) @@ -120,21 +118,21 @@ MUXPS_SRC := $(notdir $(wildcard xps/*.c)) MUCBZ_SRC := $(notdir $(wildcard cbz/*.c)) MUIMAGE_SRC := $(notdir $(wildcard image/*.c)) -$(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) -$(FITZ_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o)) -$(FITZ_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o)) -$(FITZ_LIB) : $(addprefix $(OUT)/, $(MUCBZ_SRC:%.c=%.o)) -$(FITZ_LIB) : $(addprefix $(OUT)/, $(MUIMAGE_SRC:%.c=%.o)) +$(MUPDF_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) +$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o)) +$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o)) +$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUCBZ_SRC:%.c=%.o)) +$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUIMAGE_SRC:%.c=%.o)) -$(FITZ_V8_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) -$(FITZ_V8_LIB) : $(addprefix $(OUT)/, $(MUPDF_V8_SRC:%.c=%.o)) -$(FITZ_V8_LIB) : $(addprefix $(OUT)/, $(MUPDF_V8_CPP_SRC:%.cpp=%.o)) -$(FITZ_V8_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o)) -$(FITZ_V8_LIB) : $(addprefix $(OUT)/, $(MUCBZ_SRC:%.c=%.o)) -$(FITZ_V8_LIB) : $(addprefix $(OUT)/, $(MUIMAGE_SRC:%.c=%.o)) +$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) +$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(MUPDF_V8_SRC:%.c=%.o)) +$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(MUPDF_V8_CPP_SRC:%.cpp=%.o)) +$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o)) +$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(MUCBZ_SRC:%.c=%.o)) +$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(MUIMAGE_SRC:%.c=%.o)) -libs: $(FITZ_LIB) $(THIRD_LIBS) -libs_v8: libs $(FITZ_V8_LIB) +libs: $(MUPDF_LIB) $(THIRD_LIBS) +libs_v8: libs $(MUPDF_V8_LIB) # --- Generated CMAP, FONT and JAVASCRIPT files --- @@ -151,8 +149,6 @@ FONT_BASE14_SRC := $(wildcard fonts/*.cff) FONT_DROID_SRC := fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf FONT_CJK_SRC := fonts/droid/DroidSansFallback.ttf FONT_CJK_FULL_SRC := fonts/droid/DroidSansFallbackFull.ttf -JAVASCRIPT_SRC := pdf/pdf_util.js -ADOBECA_SRC := certs/AdobeCA.p7c $(GEN)/cmap_cns.h : $(CMAP_CNS_SRC) $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CNS_SRC) @@ -163,6 +159,8 @@ $(GEN)/cmap_japan.h : $(CMAP_JAPAN_SRC) $(GEN)/cmap_korea.h : $(CMAP_KOREA_SRC) $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_KOREA_SRC) +CMAP_GEN := $(addprefix $(GEN)/, cmap_cns.h cmap_gb.h cmap_japan.h cmap_korea.h) + $(GEN)/font_base14.h : $(FONT_BASE14_SRC) $(QUIET_GEN) $(FONTDUMP) $@ $(FONT_BASE14_SRC) $(GEN)/font_droid.h : $(FONT_DROID_SRC) @@ -172,60 +170,61 @@ $(GEN)/font_cjk.h : $(FONT_CJK_SRC) $(GEN)/font_cjk_full.h : $(FONT_CJK_FULL_SRC) $(QUIET_GEN) $(FONTDUMP) $@ $(FONT_CJK_FULL_SRC) -$(GEN)/js_util.h : $(JAVASCRIPT_SRC) +FONT_GEN := $(GEN)/font_base14.h $(GEN)/font_droid.h $(GEN)/font_cjk.h $(GEN)/font_cjk_full.h + +JAVASCRIPT_SRC := pdf/pdf_util.js +JAVASCRIPT_GEN := $(GEN)/js_util.h +$(JAVASCRIPT_GEN) : $(JAVASCRIPT_SRC) $(QUIET_GEN) $(CQUOTE) $@ $(JAVASCRIPT_SRC) -$(GEN)/adobe_ca.h : $(ADOBECA_SRC) +ADOBECA_SRC := certs/AdobeCA.p7c +ADOBECA_GEN := $(GEN)/adobe_ca.h +$(ADOBECA_GEN) : $(ADOBECA_SRC) $(QUIET_GEN) $(BIN2HEX) $@ $(ADOBECA_SRC) -CMAP_HDR := $(addprefix $(GEN)/, cmap_cns.h cmap_gb.h cmap_japan.h cmap_korea.h) -FONT_HDR := $(GEN)/font_base14.h $(GEN)/font_droid.h $(GEN)/font_cjk.h $(GEN)/font_cjk_full.h -JAVASCRIPT_HDR := $(GEN)/js_util.h -ADOBECA_HDR := $(GEN)/adobe_ca.h - ifeq "$(CROSSCOMPILE)" "" -$(CMAP_HDR) : $(CMAPDUMP) | $(GEN) -$(FONT_HDR) : $(FONTDUMP) | $(GEN) -$(JAVASCRIPT_HDR) : $(CQUOTE) | $(GEN) -$(ADOBECA_HDR) : $(BIN2HEX) | $(GEN) +$(CMAP_GEN) : $(CMAPDUMP) | $(GEN) +$(FONT_GEN) : $(FONTDUMP) | $(GEN) +$(JAVASCRIPT_GEN) : $(CQUOTE) | $(GEN) +$(ADOBECA_GEN) : $(BIN2HEX) | $(GEN) endif -generate: $(CMAP_HDR) $(FONT_HDR) $(JAVASCRIPT_HDR) $(ADOBECA_HDR) +generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) -$(OUT)/pdf_cmap_table.o : $(CMAP_HDR) -$(OUT)/pdf_fontfile.o : $(FONT_HDR) -$(OUT)/pdf_js.o : $(JAVASCRIPT_HDR) -$(OUT)/crypt_pkcs7.o : $(ADOBECA_HDR) +$(OUT)/pdf_cmap_table.o : $(CMAP_GEN) +$(OUT)/pdf_fontfile.o : $(FONT_GEN) +$(OUT)/pdf_js.o : $(JAVASCRIPT_GEN) +$(OUT)/crypt_pkcs7.o : $(ADOBECA_GEN) $(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c # --- Tools and Apps --- MUDRAW := $(addprefix $(OUT)/, mudraw) -$(MUDRAW) : $(FITZ_LIB) $(THIRD_LIBS) +$(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS) MUTOOL := $(addprefix $(OUT)/, mutool) -$(MUTOOL) : $(addprefix $(OUT)/, pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) $(FITZ_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(addprefix $(OUT)/, pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) $(MUPDF_LIB) $(THIRD_LIBS) ifeq "$(NOX11)" "" MUVIEW := $(OUT)/mupdf -$(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS) +$(MUVIEW) : $(MUPDF_LIB) $(THIRD_LIBS) $(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) MUVIEW_V8 := $(OUT)/mupdf-v8 -$(MUVIEW_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS) +$(MUVIEW_V8) : $(MUPDF_V8_LIB) $(THIRD_LIBS) $(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) - $(LINK_V8_CMD) $(X11_LIBS) + $(LINK_CMD) $(X11_LIBS) $(V8_LIBS) endif MUJSTEST_V8 := $(OUT)/mujstest-v8 -$(MUJSTEST_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS) +$(MUJSTEST_V8) : $(MUPDF_V8_LIB) $(THIRD_LIBS) $(MUJSTEST_V8) : $(addprefix $(OUT)/, jstest_main.o pdfapp.o) - $(LINK_V8_CMD) + $(LINK_CMD) $(V8_LIBS) ifeq "$(V8_PRESENT)" "1" -JSTARGETS := $(MUJSTEST_V8) $(FITZ_V8_LIB) $(MUVIEW_V8) +JSTARGETS := $(MUJSTEST_V8) $(MUPDF_V8_LIB) $(MUVIEW_V8) else JSTARGETS := endif @@ -248,9 +247,9 @@ libdir ?= $(prefix)/lib incdir ?= $(prefix)/include mandir ?= $(prefix)/share/man -install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) +install: $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1 - install $(FITZ_LIB) $(DESTDIR)$(libdir) + install $(MUPDF_LIB) $(DESTDIR)$(libdir) install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h image/muimage.h $(DESTDIR)$(incdir) install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir) install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1 @@ -262,7 +261,7 @@ tags: $(wildcard */*.h */*.c) all: all-nojs $(JSTARGETS) -all-nojs: $(THIRD_LIBS) $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) +all-nojs: $(THIRD_LIBS) $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) third: $(THIRD_LIBS) @@ -24,20 +24,20 @@ ifneq "$(V8_DIR)" "" CFLAGS += -I$(V8_DIR)/include ifeq "$(build)" "release" -V8LIB_CHOICE := release +V8_LIB_CHOICE := release else ifeq "$(build)" "profile" -V8LIB_CHOICE := release +V8_LIB_CHOICE := release else -V8LIB_CHOICE := debug +V8_LIB_CHOICE := debug endif V8_ARCH ?= x64 # If you are building for 32bit linux use V8_ARCH=ia32 ifeq "$(OS)" "Darwin" -V8LIBS = -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8LIB_CHOICE)/ -lv8_base -lv8_snapshot +V8_LIBS = -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8_LIB_CHOICE)/ -lv8_base -lv8_snapshot -lstdc++ else -V8LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread +V8_LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -lstdc++ endif V8_PRESENT := 1 |