$NetBSD: patch-ac,v 1.2 2011/03/08 17:09:25 drochner Exp $

--- Makefile.orig	2011-03-03 15:10:58.000000000 +0000
+++ Makefile
@@ -41,32 +41,21 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_I
 # Build commands
 #
 
-ifneq "$(verbose)" ""
-
 GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
 CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
-LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-AR_CMD = rm -f $@ && $(AR) cru $@ $^
-
-else
-
-GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
-CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
-LD_CMD = @ echo LD $@ && $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-AR_CMD = @ echo AR $@ && rm -f $@ && $(AR) cru $@ $^
-
-endif
+LD_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
 
 #
 # Code generation tools
 #
 
 FONTDUMP_EXE := $(OBJDIR)/fontdump
-$(FONTDUMP_EXE): $(OBJDIR)/fontdump.o
+$(FONTDUMP_EXE): $(OBJDIR)/fontdump.lo
 	$(LD_CMD)
 
 CMAPDUMP_EXE := $(OBJDIR)/cmapdump
-$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o
+$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.lo
 	$(LD_CMD)
 
 #
@@ -113,7 +102,7 @@ FITZ_SRC := \
 	fitz/stm_buffer.c \
 	fitz/stm_open.c \
 	fitz/stm_read.c
-FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.o)
+FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.lo)
 $(FITZ_OBJ): $(FITZ_HDR)
 
 DRAW_SRC := $(DRAW_ARCH_SRC) \
@@ -129,8 +118,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \
 	draw/pathscan.c \
 	draw/pathstroke.c \
 	draw/porterduff.c
-DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o)
-DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.o)
+DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.lo)
+DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.lo)
 $(DRAW_OBJ): $(FITZ_HDR)
 
 MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h
@@ -167,19 +156,19 @@ MUPDF_SRC := \
 	mupdf/pdf_unicode.c \
 	mupdf/pdf_xobject.c \
 	mupdf/pdf_xref.c
-MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.o)
+MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.lo)
 $(MUPDF_OBJ): $(MUPDF_HDR)
 
-$(OBJDIR)/%.o: fitz/%.c
-	$(CC_CMD)
-$(OBJDIR)/%.o: draw/%.c
-	$(CC_CMD)
-$(OBJDIR)/%.o: draw/%.s
-	$(CC_CMD)
-$(OBJDIR)/%.o: mupdf/%.c
-	$(CC_CMD)
-$(OBJDIR)/%.o: $(GENDIR)/%.c
-	$(CC_CMD)
+$(OBJDIR)/%.lo: fitz/%.c
+	libtool --mode=compile $(CC_CMD)
+$(OBJDIR)/%.lo: draw/%.c
+	libtool --mode=compile $(CC_CMD)
+$(OBJDIR)/%.lo: draw/%.s
+	libtool --mode=compile $(CC_CMD)
+$(OBJDIR)/%.lo: mupdf/%.c
+	libtool --mode=compile $(CC_CMD)
+$(OBJDIR)/%.lo: $(GENDIR)/%.c
+	libtool --mode=compile $(CC_CMD)
 
 #
 # Generated font file dumps
@@ -218,7 +207,7 @@ FONT_SRC := \
 	$(GENDIR)/font_base14.c \
 	$(GENDIR)/font_cjk.c
 
-FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
+FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo)
 
 
 #
@@ -288,13 +277,13 @@ CMAP_SRC := \
 	$(GENDIR)/cmap_japan.c \
 	$(GENDIR)/cmap_korea.c
 
-CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
+CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo)
 
 #
 # Library
 #
 
-MUPDF_LIB = $(OBJDIR)/libmupdf.a
+MUPDF_LIB = $(OBJDIR)/libmupdf.la
 $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(MUPDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ)
 	 $(AR_CMD)
 
@@ -304,40 +293,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(
 
 APPS = $(PDFSHOW_EXE) $(PDFCLEAN_EXE) $(PDFDRAW_EXE) $(PDFEXTRACT_EXE) $(PDFINFO_EXE) $(PDFVIEW_EXE)
 
-$(OBJDIR)/%.o: apps/%.c
-	$(CC_CMD)
+$(OBJDIR)/%.lo: apps/%.c
+	libtool --mode=compile $(CC_CMD)
 
 PDFSHOW_SRC=apps/pdfshow.c
-PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.o)
+PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.lo)
 PDFSHOW_EXE=$(OBJDIR)/pdfshow
 $(PDFSHOW_OBJ): $(MUPDF_HDR)
 $(PDFSHOW_EXE): $(PDFSHOW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
 	$(LD_CMD)
 
 PDFCLEAN_SRC=apps/pdfclean.c
-PDFCLEAN_OBJ=$(PDFCLEAN_SRC:apps/%.c=$(OBJDIR)/%.o)
+PDFCLEAN_OBJ=$(PDFCLEAN_SRC:apps/%.c=$(OBJDIR)/%.lo)
 PDFCLEAN_EXE=$(OBJDIR)/pdfclean
 $(PDFCLEAN_OBJ): $(MUPDF_HDR)
 $(PDFCLEAN_EXE): $(PDFCLEAN_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
 	$(LD_CMD)
 
 PDFDRAW_SRC=apps/pdfdraw.c
-PDFDRAW_OBJ=$(PDFDRAW_SRC:apps/%.c=$(OBJDIR)/%.o)
+PDFDRAW_OBJ=$(PDFDRAW_SRC:apps/%.c=$(OBJDIR)/%.lo)
 PDFDRAW_EXE=$(OBJDIR)/pdfdraw
 $(PDFDRAW_OBJ): $(MUPDF_HDR)
 $(PDFDRAW_EXE): $(PDFDRAW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
 	$(LD_CMD)
 
 PDFEXTRACT_SRC=apps/pdfextract.c
-PDFEXTRACT_OBJ=$(PDFEXTRACT_SRC:apps/%.c=$(OBJDIR)/%.o)
+PDFEXTRACT_OBJ=$(PDFEXTRACT_SRC:apps/%.c=$(OBJDIR)/%.lo)
 PDFEXTRACT_EXE=$(OBJDIR)/pdfextract
 $(PDFEXTRACT_OBJ): $(MUPDF_HDR)
 $(PDFEXTRACT_EXE): $(PDFEXTRACT_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
 	$(LD_CMD)
 
 PDFINFO_SRC=apps/pdfinfo.c
-PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.o)
-PDFINFO_EXE=$(OBJDIR)/pdfinfo
+PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.lo)
+PDFINFO_EXE=$(OBJDIR)/mupdf-pdfinfo
 $(PDFINFO_OBJ): $(MUPDF_HDR)
 $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
 	$(LD_CMD)
@@ -345,7 +334,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L
 PDFAPP_HDR = apps/pdfapp.h
 
 X11VIEW_SRC=apps/x11_main.c apps/x11_image.c apps/pdfapp.c
-X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.o)
+X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.lo)
 X11VIEW_EXE=$(OBJDIR)/mupdf
 
 $(X11VIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR)
@@ -354,7 +343,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L
 
 WINVIEW_SRC=apps/win_main.c apps/pdfapp.c
 WINVIEW_RES=apps/win_res.rc
-WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.o) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.o)
+WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.lo)
 WINVIEW_EXE=$(OBJDIR)/mupdf.exe
 
 $(OBJDIR)/%.o: apps/%.rc
@@ -383,7 +372,7 @@ LIBDIR ?= $(prefix)/lib
 INCDIR ?= $(prefix)/include
 
 install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
-	install -d $(BINDIR) $(LIBDIR) $(INCDIR)
-	install $(APPS) $(BINDIR)
-	install $(MUPDF_LIB) $(LIBDIR)
-	install $(MUPDF_HDR) $(INCDIR)
+	mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
+	libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(BINDIR)
+	libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(LIBDIR)
+	${BSD_INSTALL_DATA} $(MUPDF_HDR) $(INCDIR)
