73 lines
2.3 KiB
Plaintext
73 lines
2.3 KiB
Plaintext
$NetBSD: patch-Makefile.in,v 1.6 2015/08/23 14:22:10 wiz Exp $
|
|
|
|
Use LIBTOOL.
|
|
|
|
--- Makefile.in.orig 2015-04-24 17:22:03.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -17,7 +17,7 @@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@
|
|
|
|
OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@
|
|
|
|
-SUBDIRS = tools testsuite examples
|
|
+SUBDIRS = tools testsuite
|
|
|
|
include config.make
|
|
|
|
@@ -25,7 +25,7 @@ PRE_CPPFLAGS = -I.
|
|
EXTRA_CFLAGS = $(CCPIC)
|
|
|
|
# FIXME: Add configuration of LIBEXT?
|
|
-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
|
|
+LIBTARGETS = @IF_STATIC@ libnettle.la @IF_HOGWEED@ libhogweed.la
|
|
SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
|
|
|
|
getopt_SOURCES = getopt.c getopt1.c
|
|
@@ -234,20 +234,20 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ
|
|
hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \
|
|
$(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT)
|
|
|
|
-libnettle.a: $(nettle_OBJS)
|
|
- -rm -f $@
|
|
- $(AR) $(ARFLAGS) $@ $(nettle_OBJS)
|
|
- $(RANLIB) $@
|
|
+libnettle.la: $(nettle_OBJS)
|
|
+ ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libnettle.la \
|
|
+ ${nettle_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
|
|
+ -version-info ${LIBNETTLE_MAJOR}:${LIBNETTLE_MINOR}
|
|
echo nettle > libnettle.stamp
|
|
|
|
-libhogweed.a: $(hogweed_OBJS)
|
|
- -rm -f $@
|
|
- $(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
|
|
- $(RANLIB) $@
|
|
+libhogweed.la: $(hogweed_OBJS)
|
|
+ ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libhogweed.la \
|
|
+ ${hogweed_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
|
|
+ -version-info ${LIBHOGWEED_MAJOR}:${LIBHOGWEED_MINOR}
|
|
echo hogweed > libhogweed.stamp
|
|
|
|
.c.$(OBJEXT):
|
|
- $(COMPILE) -c $< \
|
|
+ ${LIBTOOL} --mode=compile --tag=CC $(COMPILE) $(CCPIC_MAYBE) -c $< \
|
|
&& $(DEP_PROCESS)
|
|
|
|
# Rules building shared libraries.
|
|
@@ -372,7 +372,7 @@ ecc-25519.$(OBJEXT): ecc-25519.h
|
|
|
|
.asm.$(OBJEXT): $(srcdir)/asm.m4 machine.m4 config.m4
|
|
$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$*.s
|
|
- $(COMPILE) -c $*.s
|
|
+ ${LIBTOOL} --mode=compile $(COMPILE) -c $*.s
|
|
@echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
|
|
|
|
# Texinfo rules
|
|
@@ -442,7 +442,7 @@ install-here: install-doc install-header
|
|
install-static: $(LIBTARGETS)
|
|
$(MKDIR_P) $(DESTDIR)$(libdir)
|
|
for f in $(LIBTARGETS); do \
|
|
- $(INSTALL_DATA) $$f $(DESTDIR)$(libdir) ; \
|
|
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir) ; \
|
|
done
|
|
|
|
install-dll-nettle:
|