updated makefile

1 files changed, 98 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 56e5a304..7296c64c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,35 +14,106 @@ all: libfitz.a libmupdf.a libfonts.a pdfrip pdfclean pdfdebug x11pdf gtkpdf
 #	util/strsep.o \
 
 libfitz.a: \
-	base/cpudep.o base/error.o base/memory.o base/md5.o base/arc4.o \
-	base/rect.o base/matrix.o base/hash.o base/rune.o \
-	object/simple.o object/array.o object/dict.o object/print.o object/parse.o \
-	filter/buffer.o filter/filter.o \
-	filter/filec.o filter/filer.o filter/filew.o \
-	filter/null.o filter/arc4filter.o filter/pipeline.o \
-	filter/ahxd.o filter/ahxe.o filter/a85d.o filter/a85e.o \
-	filter/rld.o filter/rle.o filter/predict.o filter/lzwd.o filter/lzwe.o \
-	filter/faxd.o filter/faxdtab.o filter/faxe.o filter/faxetab.o \
-	filter/flate.o filter/dctd.o filter/dcte.o \
-	tree/cmap.o tree/font.o tree/colorspace.o tree/image.o tree/shade.o \
-	tree/tree.o tree/node1.o tree/node2.o tree/text.o tree/path.o \
-	tree/debug.o tree/optimize.o \
-	render/glyphcache.o render/pixmap.o render/rastshade.o render/render.o \
-	render/pathscan.o render/pathfill.o render/pathstroke.o \
-	render/optduff.o render/optimage.o render/optunpack.o render/optscale.o
+		base/cpudep.o \
+		base/error.o \
+		base/memory.o \
+		base/md5.o \
+		base/arc4.o \
+		base/rect.o \
+		base/matrix.o \
+		base/hash.o \
+		base/rune.o \
+		object/simple.o \
+		object/array.o \
+		object/dict.o \
+		object/print.o \
+		object/parse.o \
+		filter/buffer.o \
+		filter/filter.o \
+		filter/filec.o \
+		filter/filer.o \
+		filter/filew.o \
+		filter/null.o \
+		filter/arc4filter.o \
+		filter/pipeline.o \
+		filter/ahxd.o \
+		filter/ahxe.o \
+		filter/a85d.o \
+		filter/a85e.o \
+		filter/rld.o \
+		filter/rle.o \
+		filter/predict.o \
+		filter/lzwd.o \
+		filter/lzwe.o \
+		filter/faxd.o \
+		filter/faxdtab.o \
+		filter/faxe.o \
+		filter/faxetab.o \
+		filter/flate.o \
+		filter/dctd.o \
+		filter/dcte.o \
+		tree/cmap.o \
+		tree/font.o \
+		tree/colorspace.o \
+		tree/image.o \
+		tree/shade.o \
+		tree/tree.o \
+		tree/node1.o \
+		tree/node2.o \
+		tree/text.o \
+		tree/path.o \
+		tree/debug.o \
+		tree/optimize.o \
+		render/glyphcache.o \
+		render/pixmap.o \
+		render/porterduff.o \
+		render/meshdraw.o \
+		render/imagedraw.o \
+		render/imageunpack.o \
+		render/imagescale.o \
+		render/pathscan.o \
+		render/pathfill.o \
+		render/pathstroke.o \
+		render/render.o
 	ar cru $(@) $(?)
 	ranlib $(@)
 
 libmupdf.a: \
-	mupdf/debug.o mupdf/lex.o mupdf/parse.o mupdf/crypt.o \
-	mupdf/open.o mupdf/repair.o mupdf/save.o mupdf/xref.o \
-	mupdf/stream.o mupdf/doctor.o \
-	mupdf/nametree.o mupdf/outline.o mupdf/pagetree.o mupdf/function.o \
-	mupdf/cmap.o mupdf/fontagl.o mupdf/fontenc.o mupdf/fontfile.o \
-	mupdf/unicode.o mupdf/font.o mupdf/type3.o \
-	mupdf/colorspace1.o mupdf/colorspace2.o \
-	mupdf/image.o mupdf/xobject.o mupdf/pattern.o mupdf/shade.o \
-	mupdf/resources.o mupdf/page.o mupdf/build.o mupdf/interpret.o
+		mupdf/debug.o \
+		mupdf/lex.o \
+		mupdf/parse.o \
+		mupdf/crypt.o \
+		mupdf/open.o \
+		mupdf/repair.o \
+		mupdf/save.o \
+		mupdf/xref.o \
+		mupdf/stream.o \
+		mupdf/doctor.o \
+		mupdf/nametree.o \
+		mupdf/outline.o \
+		mupdf/annot.o \
+		mupdf/pagetree.o \
+		mupdf/store.o \
+		mupdf/resources.o \
+		mupdf/function.o \
+		mupdf/colorspace1.o \
+		mupdf/colorspace2.o \
+		mupdf/xobject.o \
+		mupdf/image.o \
+		mupdf/pattern.o \
+		mupdf/shade.o \
+		mupdf/shade2.o \
+		mupdf/shade3.o \
+		mupdf/cmap.o \
+		mupdf/unicode.o \
+		mupdf/fontagl.o \
+		mupdf/fontenc.o \
+		mupdf/fontfile.o \
+		mupdf/font.o \
+		mupdf/type3.o \
+		mupdf/page.o \
+		mupdf/build.o \
+		mupdf/interpret.o
 	ar cru $(@) $(?)
 	ranlib $(@)
 
@@ -103,9 +174,8 @@ pdfrip: test/pdfrip.o
 	$(CC) -o $(@) $(?) libmupdf.a libfonts.a libfitz.a $(LDLIBS)
 
 pdfdebug: test/pdfdebug.o
-	$(CC) -o $(@) $(?) libmupdf.a libfitz.a $(LDLIBS)
+	$(CC) -o $(@) $(?) libmupdf.a libfonts.a libfitz.a $(LDLIBS)
 
 pdfclean: test/pdfclean.o
-	$(CC) -o $(@) $(?) libmupdf.a libfitz.a $(LDLIBS)
-
+	$(CC) -o $(@) $(?) libmupdf.a libfonts.a libfitz.a $(LDLIBS)