c04ade8bb8
changes: -support for PKCS #5 PBKDF2, SHA3, GOST R 34.11-94 -bugfixes -minor improvements
44 lines
1.8 KiB
Text
44 lines
1.8 KiB
Text
$NetBSD: patch-tools_Makefile.in,v 1.3 2013/03/15 18:22:03 drochner Exp $
|
|
|
|
Use LIBTOOL.
|
|
|
|
--- tools/Makefile.in.orig 2013-01-14 21:44:12.000000000 +0000
|
|
+++ tools/Makefile.in
|
|
@@ -34,20 +34,20 @@ SOURCES = $(sexp_conv_SOURCES) nettle-ha
|
|
DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
|
|
|
|
sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
|
|
-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
|
|
- $(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
|
|
+sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.la
|
|
+ $(LINK) $(sexp_conv_OBJS) ../libnettle.la $(LIBS) -o $@
|
|
|
|
-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
|
|
- $(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
|
|
+nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.la
|
|
+ $(LINK) nettle-lfib-stream.$(OBJEXT) ../libnettle.la $(LIBS) -o $@
|
|
|
|
pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
|
|
-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
|
|
- $(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
|
|
+pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.la ../libhogweed.la
|
|
+ $(LINK) $(pkcs1_conv_OBJS) ../libhogweed.la ../libnettle.la $(LIBS) -o $@
|
|
|
|
# FIXME: Avoid linking with gmp
|
|
nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
|
|
-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
|
|
- $(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
|
|
+nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.la
|
|
+ $(LINK) $(nettle_hash_OBJS) ../libnettle.la $(LIBS) -o $@
|
|
|
|
|
|
.c.$(OBJEXT):
|
|
@@ -69,7 +69,7 @@ check:
|
|
install: $(TARGETS)
|
|
$(MKDIR_P) $(DESTDIR)$(bindir)
|
|
for f in $(TARGETS) ; do \
|
|
- $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir) ; \
|
|
+ ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir) ; \
|
|
done
|
|
|
|
uninstall:
|