diff options
| author | Paul Gardiner <paul@glidos.net> | 2012-06-01 09:38:51 +0100 |
|---|---|---|
| committer | Paul Gardiner <paul@glidos.net> | 2012-06-01 09:38:51 +0100 |
| commit | 2aea3684b5571f469f4ad29f409b61fb9da35e2a (patch) | |
| tree | 7b2c80c1e49e18549a2210101579235a915b4ea2 /Makefile | |
| parent | 741fe4a4d7bbd6ee914504be7e85356a741601c4 (diff) | |
| parent | d9982f81e105d5e1084283225ed72b1943ca3693 (diff) | |
| download | mupdf-2aea3684b5571f469f4ad29f409b61fb9da35e2a.tar.xz | |
Merge branch 'master' into forms
Conflicts:
fitz/doc_document.c
fitz/fitz-internal.h
fitz/fitz.h
fitz/stm_buffer.c
pdf/mupdf-internal.h
pdf/pdf_object.c
pdf/pdf_xobject.c
pdf/pdf_xref.c
win32/mupdf.sln
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -133,19 +133,16 @@ $(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c # --- Tools and Apps --- -MU_APPS := $(addprefix $(OUT)/, mudraw mupdfclean mupdfextract mupdfinfo mupdfshow) +MUDRAW := $(addprefix $(OUT)/, mudraw) +$(MUDRAW) : $(FITZ_LIB) $(THIRD_LIBS) -$(MU_APPS) : $(FITZ_LIB) $(THIRD_LIBS) - -BUSY_SRC := $(notdir $(wildcard apps/mubusy_*.c)) -BUSY_APP := $(addprefix $(OUT)/, mubusy) -$(BUSY_APP) : $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.o)) -$(BUSY_APP) : $(FITZ_LIB) $(THIRD_LIBS) +MUBUSY := $(addprefix $(OUT)/, mubusy) +$(MUBUSY) : $(addprefix $(OUT)/, mupdfclean.o mupdfextract.o mupdfinfo.o mupdfposter.o mupdfshow.o) $(FITZ_LIB) $(THIRD_LIBS) ifeq "$(NOX11)" "" -MUPDF := $(OUT)/mupdf -$(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS) -$(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) +MUVIEW := $(OUT)/mupdf +$(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS) +$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) endif @@ -167,16 +164,16 @@ libdir ?= $(prefix)/lib incdir ?= $(prefix)/include mandir ?= $(prefix)/share/man -install: $(FITZ_LIB) $(MU_APPS) $(MUPDF) +install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY) install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1 install $(FITZ_LIB) $(libdir) install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir) - install $(MU_APPS) $(MUPDF) $(bindir) + install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(bindir) install $(wildcard apps/man/*.1) $(mandir)/man1 # --- Clean and Default --- -all: $(THIRD_LIBS) $(FITZ_LIB) $(MU_APPS) $(MUPDF) $(BUSY_APP) +all: $(THIRD_LIBS) $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY) clean: rm -rf $(OUT) |