diff -Naur mupdf-1.0-source/Makefile mupdf-1.0-source-haiku/Makefile
|
old
|
new
|
|
| 12 | 12 | # Do not specify CFLAGS or LIBS on the make invocation line - specify |
| 13 | 13 | # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that |
| 14 | 14 | # set a variable that was set on the command line. |
| 15 | | CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts |
| 16 | | LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm |
| | 15 | CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts -I/boot/develop/headers/3rdparty/freetype2 |
| | 16 | LIBS += -L/boot/common/lib/ -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lroot |
| 17 | 17 | |
| 18 | 18 | include Makerules |
| 19 | 19 | include Makethird |
| … |
… |
|
| 144 | 144 | |
| 145 | 145 | ifeq "$(NOX11)" "" |
| 146 | 146 | MUPDF := $(OUT)/mupdf |
| 147 | | $(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS) |
| | 147 | $(MUPDF) : $(FITZ_LIB) |
| 148 | 148 | $(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) |
| 149 | 149 | $(LINK_CMD) $(X11_LIBS) |
| 150 | 150 | endif |
| … |
… |
|
| 167 | 167 | incdir ?= $(prefix)/include |
| 168 | 168 | mandir ?= $(prefix)/share/man |
| 169 | 169 | |
| 170 | | install: $(FITZ_LIB) $(MU_APPS) $(MUPDF) |
| | 170 | install: $(FITZ_LIB) |
| 171 | 171 | install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1 |
| 172 | 172 | install $(FITZ_LIB) $(libdir) |
| 173 | 173 | install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir) |
| 174 | | install $(MU_APPS) $(MUPDF) $(bindir) |
| 175 | 174 | install $(wildcard apps/man/*.1) $(mandir)/man1 |
| 176 | 175 | |
| 177 | 176 | # --- Clean and Default --- |