Correctly use libtool's --mode argument, don't depend on deprecated

auto-sensing.
This commit is contained in:
joerg 2009-09-02 11:01:50 +00:00
parent 39f96762ad
commit 9b8b09b426
3 changed files with 11 additions and 11 deletions

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.12 2006/02/07 03:54:25 minskim Exp $
$NetBSD: distinfo,v 1.13 2009/09/02 11:01:50 joerg Exp $
SHA1 (adns-1.1.tar.gz) = cd47dfc819b147b3275eaf6316f17f15be7187e5
RMD160 (adns-1.1.tar.gz) = c6198f864afc40657dd94b7a94cf59a483ab7581
Size (adns-1.1.tar.gz) = 211455 bytes
SHA1 (patch-aa) = 17764ad5a7557bcda1fda5fdb62fbb7d4e0cd075
SHA1 (patch-ab) = 3eaa20dbe95de934693c00b73d42fbaf8ff5e5e9
SHA1 (patch-aa) = 7ac1403a5f3d5a69de3976c0931f41bfd512c277
SHA1 (patch-ab) = 354afdcbdbcf733b13de93eaa9e896b9ea21c819
SHA1 (patch-ac) = 2928cd6ccd224bc6d355e52b2f8dc149beaaff84
SHA1 (patch-ad) = 5ce6a933673c82b2058ff67223057bbf18f5d8bb
SHA1 (patch-ae) = fdcc3815b880538ef2c124c7ff3c0ac74b25a14f

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.1 2001/11/19 19:39:05 jlam Exp $
$NetBSD: patch-aa,v 1.2 2009/09/02 11:01:50 joerg Exp $
--- client/Makefile.in.orig Sat Sep 16 20:43:10 2000
+++ client/Makefile.in
@ -16,14 +16,14 @@ $NetBSD: patch-aa,v 1.1 2001/11/19 19:39:05 jlam Exp $
install: $(TARG_INSTALL)
set -xe; for f in $(TARG_INSTALL); \
- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+ do ${LIBTOOL} $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+ do ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
uninstall:
for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
adnshost: $(ADH_OBJS) $(DYNAMIC_DEP)
- $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+ $(LIBTOOL) $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
adnshost_s: $(ADH_OBJS) $(STATIC_LIB)
$(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.1 2001/11/19 19:39:05 jlam Exp $
%: %.o $(DYNAMIC_DEP)
- $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+ ${LIBTOOL} $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+ ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
%_s: %.o $(STATIC_LIB)
$(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.1 2001/11/19 19:39:05 jlam Exp $
$NetBSD: patch-ab,v 1.2 2009/09/02 11:01:50 joerg Exp $
--- src/Makefile.in.orig Sat Sep 16 20:24:24 2000
+++ src/Makefile.in
@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.1 2001/11/19 19:39:05 jlam Exp $
install:
set -xe; for f in $(TARGETS); \
- do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
+ do ${LIBTOOL} $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
+ do ${LIBTOOL} --mode=install $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
$(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h
uninstall:
@ -28,9 +28,9 @@ $NetBSD: patch-ab,v 1.1 2001/11/19 19:39:05 jlam Exp $
- $(RANLIB) $@.new
- mv -f $@.new $@
+libadns.la: $(LIBOBJS)
+ ${LIBTOOL} $(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info $(MAJOR):$(MINOR)
+ ${LIBTOOL} $(CC) --mode=link $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info $(MAJOR):$(MINOR)
$(LIBOBJS): adns.h internal.h config.h
+
+.c.o:
+ ${LIBTOOL} $(CC) $(CFLAGS) -c $<
+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c $<