$NetBSD: patch-ac,v 1.3 2012/03/24 13:31:58 drochner Exp $

--- Makefile.orig	2011-09-05 11:55:39.000000000 +0000
+++ Makefile
@@ -21,17 +21,9 @@ THIRD_LIBS += $(JPEG_LIB)
 THIRD_LIBS += $(OPENJPEG_LIB)
 THIRD_LIBS += $(ZLIB_LIB)
 
-ifeq "$(verbose)" ""
-QUIET_AR = @ echo ' ' ' ' AR $@ ;
-QUIET_CC = @ echo ' ' ' ' CC $@ ;
-QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
-QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
-endif
-
 CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
-AR_CMD = $(QUIET_AR) $(AR) cru $@ $^
-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
 
 # --- Rules ---
@@ -39,40 +31,40 @@ MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
 $(OUT) $(GEN) :
 	$(MKDIR_CMD)
 
-$(OUT)/%.a :
+$(OUT)/%.la :
 	$(AR_CMD)
 
-$(OUT)/% : $(OUT)/%.o
+$(OUT)/% : $(OUT)/%.lo
 	$(LINK_CMD)
 
-$(OUT)/%.o : fitz/%.c fitz/fitz.h | $(OUT)
-	$(CC_CMD)
-$(OUT)/%.o : draw/%.c fitz/fitz.h | $(OUT)
-	$(CC_CMD)
-$(OUT)/%.o : pdf/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
-	$(CC_CMD)
-$(OUT)/%.o : xps/%.c fitz/fitz.h xps/muxps.h | $(OUT)
-	$(CC_CMD)
-$(OUT)/%.o : apps/%.c fitz/fitz.h pdf/mupdf.h xps/muxps.h | $(OUT)
-	$(CC_CMD)
-$(OUT)/%.o : scripts/%.c | $(OUT)
-	$(CC_CMD)
+$(OUT)/%.lo : fitz/%.c fitz/fitz.h | $(OUT)
+	libtool --mode=compile $(CC_CMD)
+$(OUT)/%.lo : draw/%.c fitz/fitz.h | $(OUT)
+	libtool --mode=compile $(CC_CMD)
+$(OUT)/%.lo : pdf/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
+	libtool --mode=compile $(CC_CMD)
+$(OUT)/%.lo : xps/%.c fitz/fitz.h xps/muxps.h | $(OUT)
+	libtool --mode=compile $(CC_CMD)
+$(OUT)/%.lo : apps/%.c fitz/fitz.h pdf/mupdf.h xps/muxps.h | $(OUT)
+	libtool --mode=compile $(CC_CMD)
+$(OUT)/%.lo : scripts/%.c | $(OUT)
+	libtool --mode=compile $(CC_CMD)
 
-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
 
 # --- Fitz, MuPDF and MuXPS libraries ---
 
-FITZ_LIB := $(OUT)/libfitz.a
-MUPDF_LIB := $(OUT)/libmupdf.a
-MUXPS_LIB := $(OUT)/libmuxps.a
+FITZ_LIB := $(OUT)/libfitz.la
+MUPDF_LIB := $(OUT)/libmupdf.la
+MUXPS_LIB := $(OUT)/libmuxps.la
 
 FITZ_SRC := $(notdir $(wildcard fitz/*.c draw/*.c))
 MUPDF_SRC := $(notdir $(wildcard pdf/*.c))
 MUXPS_SRC := $(notdir $(wildcard xps/*.c))
 
-$(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o))
-$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o))
-$(MUXPS_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o))
+$(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.lo))
+$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.lo))
+$(MUXPS_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.lo))
 
 libs: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
 	@ echo MuPDF/XPS and underlying libraries built
@@ -116,13 +108,13 @@ endif
 
 generate: $(CMAP_HDR) $(FONT_HDR)
 
-$(OUT)/pdf_cmap_table.o : $(CMAP_HDR)
-$(OUT)/pdf_fontfile.o : $(FONT_HDR)
-$(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c
+$(OUT)/pdf_cmap_table.lo : $(CMAP_HDR)
+$(OUT)/pdf_fontfile.lo : $(FONT_HDR)
+$(OUT)/cmapdump.lo : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c
 
 # --- Tools and Apps ---
 
-PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract pdfinfo pdfshow)
+PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract mupdf-pdfinfo pdfshow)
 XPS_APPS := $(addprefix $(OUT)/, xpsdraw)
 
 $(PDF_APPS) : $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
@@ -131,7 +123,7 @@ $(XPS_APPS) : $(MUXPS_LIB) $(FITZ_LIB) $
 MUPDF := $(OUT)/mupdf
 $(MUPDF) : $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
 ifeq "$(NOX11)" ""
-$(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
+$(MUPDF) : $(addprefix $(OUT)/, x11_main.lo x11_image.lo pdfapp.lo)
 	$(LINK_CMD) $(X11_LIBS)
 endif
 
@@ -141,14 +133,18 @@ prefix ?= /usr/local
 bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/lib
 incdir ?= $(prefix)/include
-mandir ?= $(prefix)/share/man
+mandir ?= $(prefix)/man
 
 install: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
-	install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
-	install $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(libdir)
-	install fitz/fitz.h pdf/mupdf.h xps/muxps.h $(incdir)
-	install $(PDF_APPS) $(XPS_APPS) $(MUPDF) $(bindir)
-	install $(wildcard apps/man/*.1) $(mandir)/man1
+	${BSD_INSTALL_DATA_DIR} $(bindir) $(libdir) $(incdir) $(mandir)/man1
+	for f in $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB); do \
+	 libtool --mode=install ${BSD_INSTALL_LIB} $$f $(libdir); \
+	done
+	${BSD_INSTALL_DATA} fitz/fitz.h pdf/mupdf.h xps/muxps.h $(incdir)
+	for f in $(PDF_APPS) $(XPS_APPS) $(MUPDF); do \
+	 libtool --mode=install ${BSD_INSTALL_PROGRAM} $$f $(bindir); \
+	done
+	${BSD_INSTALL_DATA} $(wildcard apps/man/*.1) $(mandir)/man1
 
 # --- Clean and Default ---
 
