summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2013-06-17 16:34:58 +0200
committerTor Andersson <tor.andersson@artifex.com>2013-06-18 17:37:13 +0200
commit8856f8521a42872a95579666b24ecfb65c5a20a1 (patch)
treeeab5136996379f77d52699c25f8855ea36d06cc2 /Makefile
parent03e5755b93e90cc4c09daad4c79b6016bf4ce43c (diff)
downloadmupdf-8856f8521a42872a95579666b24ecfb65c5a20a1.tar.xz
Merge common and internal headers into one.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 21dd4528..533811ab 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
build ?= debug
-OUT ?= build/$(build)
+OUT := build/$(build)
GEN := generated
# --- Variables, Commands, etc... ---
@@ -12,7 +12,7 @@ default: all
# Do not specify CFLAGS or LIBS on the make invocation line - specify
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
# set a variable that was set on the command line.
-CFLAGS += $(XCFLAGS) -Iinclude -Iucdn -Iscripts
+CFLAGS += $(XCFLAGS) -Iinclude -Iscripts -I$(GEN) -Iucdn
LIBS += $(XLIBS) -lm
include Makerules
@@ -58,9 +58,9 @@ RM_CMD = $(QUIET_RM) rm -f $@
# --- Rules ---
-FITZ_HDR := include/mupdf/fitz.h include/mupdf/fitz-internal.h
-MUPDF_HDR := $(FITZ_HDR) include/mupdf/pdf.h include/mupdf/pdf-internal.h
-MUXPS_HDR := $(FITZ_HDR) include/mupdf/xps.h include/mupdf/xps-internal.h
+FITZ_HDR := include/mupdf/fitz.h
+MUPDF_HDR := $(FITZ_HDR) include/mupdf/pdf.h
+MUXPS_HDR := $(FITZ_HDR) include/mupdf/xps.h
MUCBZ_HDR := $(FITZ_HDR) include/mupdf/cbz.h
MUIMAGE_HDR := $(FITZ_HDR) include/mupdf/image.h