$NetBSD: patch-lib_Makefile,v 1.3 2021/12/20 20:41:38 nia Exp $ Honor LDFLAGS. Simplify install target. --- lib/Makefile.orig 2021-11-16 12:19:56.000000000 +0000 +++ lib/Makefile @@ -131,7 +131,7 @@ $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX). $(SYMLINK) $< $@ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ - $(SHLIB_CLIB) -lm $(LADD) + $(SHLIB_CLIB) -lm $(LDFLAGS) $(LADD) endif ifeq ($(NETPBMLIBTYPE),dll) @@ -207,7 +207,7 @@ standardppmdfont.c: # else, so it was really sloppy. compile.h: - $(SRCDIR)/buildtools/stamp-date >$@ || rm $@ + echo >$@ || rm $@ $(LIBOBJECTS_X): FORCE @if [ ! -d $(dir $@) ] ; then mkdir $(dir $@) ; fi @@ -221,7 +221,7 @@ libpm.o: compile.h .PHONY: install.lib ifeq ($(NETPBMLIBTYPE),unixshared) # install a Unix-style shared library -install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink +install.lib: $(PKGDIR)/lib cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ @@ -263,29 +263,29 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/ .PHONY: install.staticlib -install.staticlib: $(PKGDIR)/staticlink +install.staticlib: $(PKGDIR)/lib $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ - $(PKGDIR)/staticlink + $(PKGDIR)/lib # Install a shared library stub -- the ".so" file used at link time to # prepare a program for dynamically linking a library at run time .PHONY: install.sharedlibstub -install.sharedlibstub: $(PKGDIR)/sharedlink +install.sharedlibstub: $(PKGDIR)/lib ifeq ($(NETPBMLIBTYPE),unixshared) # install the link-time (.so) links to the runtime libraries - cd $(PKGDIR)/sharedlink ; \ + cd $(PKGDIR)/lib ; \ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ - $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ libnetpbm.$(NETPBMLIBSUFFIX) endif ifeq ($(NETPBMLIBTYPE),dll) $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \ - $(PKGDIR)/sharedlink + $(PKGDIR)/lib endif ifeq ($(NETPBMLIBTYPE),dylib) - cd $(PKGDIR)/sharedlink/ ; \ + cd $(PKGDIR)/lib/ ; \ rm -f libnetpbm.dylib; \ - $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib + $(SYMLINK) libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib endif distclean clean: localclean