diff options
author | Robin Watts <robin.watts@artifex.com> | 2012-03-13 20:25:38 +0000 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2012-03-13 20:59:19 +0000 |
commit | 3212863288c4ad6396482b8fdb14db2af27c123f (patch) | |
tree | 9d7c7efe3a585c538f6e8d0edd5e3a77b5b8b6b5 /Makefile | |
parent | b6e9b2f8fe172d7175cea3d14d89f986688639af (diff) | |
parent | 33dc06b61c0816854193f006c35a9e797f098a22 (diff) | |
download | mupdf-3212863288c4ad6396482b8fdb14db2af27c123f.tar.xz |
Merge master and pg_android branches
Bring up to date with current APIs, including text device changes.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -36,6 +36,11 @@ MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ # --- Rules --- +FITZ_HDR := fitz/fitz.h fitz/fitz-internal.h +MUPDF_HDR := $(FITZ_HDR) pdf/mupdf.h pdf/mupdf-internal.h +MUXPS_HDR := $(FITZ_HDR) xps/muxps.h xps/muxps-internal.h +MUCBZ_HDR := $(FITZ_HDR) cbz/mucbz.h + $(OUT) $(GEN) : $(MKDIR_CMD) @@ -46,15 +51,15 @@ $(OUT)/%.a : $(OUT)/% : $(OUT)/%.o $(LINK_CMD) -$(OUT)/%.o : fitz/%.c fitz/fitz.h | $(OUT) +$(OUT)/%.o : fitz/%.c $(FITZ_HDR) | $(OUT) $(CC_CMD) -$(OUT)/%.o : draw/%.c fitz/fitz.h | $(OUT) +$(OUT)/%.o : draw/%.c $(FITZ_HDR) | $(OUT) $(CC_CMD) -$(OUT)/%.o : pdf/%.c fitz/fitz.h pdf/mupdf.h | $(OUT) +$(OUT)/%.o : pdf/%.c $(MUPDF_HDR) | $(OUT) $(CC_CMD) -$(OUT)/%.o : xps/%.c fitz/fitz.h xps/muxps.h | $(OUT) +$(OUT)/%.o : xps/%.c $(MUXPS_HDR) | $(OUT) $(CC_CMD) -$(OUT)/%.o : cbz/%.c fitz/fitz.h cbz/mucbz.h | $(OUT) +$(OUT)/%.o : cbz/%.c $(MUCBZ_HDR) | $(OUT) $(CC_CMD) $(OUT)/%.o : apps/%.c fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h | $(OUT) $(CC_CMD) |