$NetBSD: patch-Makefile,v 1.3 2023/05/26 20:38:47 schmonz Exp $ Libtoolize for portable shared libraries. --- Makefile.orig 2023-05-20 19:09:00.000000000 +0000 +++ Makefile @@ -1,5 +1,6 @@ .PHONY: regress regen_regress .SUFFIXES: .xml .md .html .pdf .1 .1.html .3 .3.html .5 .5.html .thumb.jpg .png .in.pc .pc .valgrind .old.md .diff-valgrind +.SUFFIXES: .lo include Makefile.configure @@ -125,7 +126,11 @@ REGRESS_ARGS += "--parse-no-deflists" VALGRIND_ARGS = -q --leak-check=full --leak-resolution=high --show-reachable=yes -all: bins lowdown.pc liblowdown.so +LIBTOOL = libtool --tag=CC +LT_OBJS = $(OBJS:C/\.o$/.lo/g) +LT_COMPAT_OBJS = $(COMPAT_OBJS:C/\.o$/.lo/g) + +all: bins lowdown.pc liblowdown.la bins: lowdown lowdown-diff valgrind: $(VALGRINDS) $(VALGRINDDIFFS) @@ -173,11 +178,13 @@ installwww: www $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots -lowdown: liblowdown.a main.o - $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) +lowdown: liblowdown.la main.lo + $(LIBTOOL) --mode=link $(CC) -o $@ main.lo -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) -lowdown-diff: lowdown - ln -f lowdown lowdown-diff +# For regress, we build this (just like lowdown) so that its libtool wrapper works. +# At install, we'll still just make a hard link to lowdown like upstream. +lowdown-diff: liblowdown.la main.lo + $(LIBTOOL) --mode=link $(CC) -o $@ main.lo -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) liblowdown.a: $(OBJS) $(COMPAT_OBJS) $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) @@ -186,14 +193,17 @@ liblowdown.so: $(OBJS) $(COMPAT_OBJS) $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm -Wl,${LINKER_SONAME},$@.$(LIBVER) $(LDLIBS) ln -sf $@.$(LIBVER) $@ +liblowdown.la: $(LT_OBJS) $(LT_COMPAT_OBJS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LT_OBJS) $(LT_COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm $(LDLIBS) -version-number $(LIBVER) -rpath $(LIBDIR) + install: bins mkdir -p $(DESTDIR)$(BINDIR) mkdir -p $(DESTDIR)$(MANDIR)/man1 mkdir -p $(DESTDIR)$(MANDIR)/man5 mkdir -p $(DESTDIR)$(SHAREDIR)/lowdown/odt $(INSTALL_DATA) share/odt/styles.xml $(DESTDIR)$(SHAREDIR)/lowdown/odt - $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) - $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) + ln $(DESTDIR)$(BINDIR)/lowdown $(DESTDIR)$(BINDIR)/lowdown-diff for f in $(MAN1S) $(MAN5S) ; do \ name=`basename $$f .html` ; \ section=$${name##*.} ; \ @@ -212,6 +222,9 @@ install_lib_common: lowdown.pc $(INSTALL_MAN) man/$$name $(DESTDIR)$(MANDIR)/man$$section ; \ done +install_pkgsrc: liblowdown.la install_lib_common + $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) liblowdown.la $(DESTDIR)$(LIBDIR) + install_shared: liblowdown.so install_lib_common $(INSTALL_LIB) liblowdown.so.$(LIBVER) $(DESTDIR)$(LIBDIR) ( cd $(DESTDIR)$(LIBDIR) && ln -sf liblowdown.so.$(LIBVER) liblowdown.so ) @@ -279,6 +292,9 @@ diff.diff.pdf: diff.md diff.old.md lowdo $(HTMLS): versions.xml lowdown +.c.lo: + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< + .md.xml: lowdown ( echo "" ; \ echo "
" ; \ @@ -313,13 +329,13 @@ lowdown.tar.gz: ( cd .dist/ && tar zcf ../$@ lowdown-$(VERSION) ) rm -rf .dist/ -$(OBJS) $(COMPAT_OBJS) main.o: config.h +$(LT_OBJS) $(LT_COMPAT_OBJS) main.lo: config.h -$(OBJS): extern.h lowdown.h +$(LT_OBJS): extern.h lowdown.h -term.o: term.h +term.lo: term.h -main.o: lowdown.h +main.lo: lowdown.h clean: rm -f $(OBJS) $(COMPAT_OBJS) main.o