You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
90 lines
3.2 KiB
90 lines
3.2 KiB
12 years ago
|
--- nettle-2.6/examples/Makefile.in
|
||
|
+++ nettle-2.6/examples/Makefile.in
|
||
|
@@ -8,7 +8,7 @@
|
||
|
include ../config.make
|
||
|
|
||
|
PRE_CPPFLAGS = -I.. -I$(top_srcdir)
|
||
|
-PRE_LDFLAGS = -L..
|
||
|
+PRE_LDFLAGS = -L../.lib
|
||
|
|
||
|
OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
|
||
|
BENCH_LIBS = @BENCH_LIBS@ -lm
|
||
|
@@ -49,11 +49,11 @@
|
||
|
( cd .. && $(MAKE) nettle-internal.$(OBJEXT))
|
||
|
|
||
|
# For Solaris and BSD make, we have to use an explicit rule for each executable
|
||
|
-next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
|
||
|
+next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../$(LIBHOGWEED_FORLINK)
|
||
|
$(LINK) next-prime.$(OBJEXT) $(GETOPT_OBJS) \
|
||
|
-lhogweed -lnettle $(LIBS) -o next-prime$(EXEEXT)
|
||
|
|
||
|
-random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
|
||
|
+random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../$(LIBHOGWEED_FORLINK)
|
||
|
$(LINK) random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
|
||
|
-lhogweed -lnettle $(LIBS) -o random-prime$(EXEEXT)
|
||
|
|
||
|
@@ -102,7 +102,7 @@
|
||
|
nettle-benchmark$(EXEEXT): $(BENCH_OBJS)
|
||
|
$(LINK) $(BENCH_OBJS) -lnettle $(BENCH_LIBS) $(OPENSSL_LIBFLAGS) -o nettle-benchmark$(EXEEXT)
|
||
|
|
||
|
-$(TARGETS) : io.$(OBJEXT) ../libnettle.a
|
||
|
+$(TARGETS) : io.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
|
||
|
|
||
|
|
||
|
check: $(TS_ALL)
|
||
|
--- nettle-2.6/testsuite/Makefile.in
|
||
|
+++ nettle-2.6/testsuite/Makefile.in
|
||
|
@@ -8,7 +8,7 @@
|
||
|
include ../config.make
|
||
|
|
||
|
PRE_CPPFLAGS = -I.. -I$(top_srcdir)
|
||
|
-PRE_LDFLAGS = -L..
|
||
|
+PRE_LDFLAGS = -L../.lib
|
||
|
|
||
|
TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
|
||
|
blowfish-test.c cast128-test.c \
|
||
|
@@ -93,7 +93,7 @@
|
||
|
include $(srcdir)/.test-rules.make
|
||
|
|
||
|
$(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
|
||
|
- ../libnettle.a @IF_HOGWEED@ ../libhogweed.a
|
||
|
+ ../$(LIBNETTLE_FORLINK) @IF_HOGWEED@ ../$(LIBHOGWEED_FORLINK)
|
||
|
|
||
|
# For use as, e.g.,
|
||
|
#
|
||
|
--- nettle-2.6/tools/Makefile.in
|
||
|
+++ nettle-2.6/tools/Makefile.in
|
||
|
@@ -15,7 +15,7 @@
|
||
|
include ../config.make
|
||
|
|
||
|
PRE_CPPFLAGS = -I.. -I$(top_srcdir)
|
||
|
-PRE_LDFLAGS = -L..
|
||
|
+PRE_LDFLAGS = -L../.lib
|
||
|
|
||
|
HOGWEED_TARGETS = pkcs1-conv$(EXEEXT)
|
||
|
TARGETS = sexp-conv$(EXEEXT) nettle-hash$(EXEEXT) nettle-lfib-stream$(EXEEXT) \
|
||
|
@@ -34,19 +34,19 @@
|
||
|
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
|
||
|
+sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../$(LIBNETTLE_FORLINK)
|
||
|
$(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
|
||
|
|
||
|
-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
|
||
|
+nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
|
||
|
$(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
|
||
|
|
||
|
pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
|
||
|
-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
|
||
|
+pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../$(LIBNETTLE_FORLINK) ../$(LIBHOGWEED_FORLINK)
|
||
|
$(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(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
|
||
|
+nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../$(LIBNETTLE_FORLINK)
|
||
|
$(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
|
||
|
|
||
|
|