diff --git a/ChangeLog b/ChangeLog index acda5f047e71bd87813ab9007ba9936e871fba01..3944e48ed1a7a774a1c0f0ba94286c4cf4f28d10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * non-nettle.c: New file, renamed from ... * nettle-internal.c: ... old name, deleted. * Makefile.in (internal_SOURCES, DISTFILES): Updated accordingly. + * testsuite/Makefile.in (TEST_OBJS): Replace ../nettle-internal.o + with ../non-nettle.o, and update corresponding make rule. + * examples/Makefile.in (BENCH_OBJS): Likewise. 2023-11-22 Niels Möller <nisse@lysator.liu.se> diff --git a/examples/Makefile.in b/examples/Makefile.in index eb6a81790403f5faa9be84acb6004d0737722b70..7a6a59346ebea03466923276b3c4bbc37d481f7e 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -49,8 +49,8 @@ all: $(TARGETS) ( cd .. && $(MAKE) getopt.$(OBJEXT)) ../getopt1.$(OBJEXT): ( cd .. && $(MAKE) getopt1.$(OBJEXT)) -../nettle-internal.$(OBJEXT): - ( cd .. && $(MAKE) nettle-internal.$(OBJEXT)) +../non-nettle.$(OBJEXT): + ( cd .. && $(MAKE) non-nettle.$(OBJEXT)) # For Solaris and BSD make, we have to use an explicit rule for each executable random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) @@ -95,7 +95,7 @@ base64dec$(EXEEXT): base64dec.$(OBJEXT) io.$(OBJEXT) -lnettle $(LIBS) -o base64dec$(EXEEXT) BENCH_OBJS = nettle-benchmark.$(OBJEXT) nettle-openssl.$(OBJEXT) \ - $(GETOPT_OBJS) ../nettle-internal.$(OBJEXT) timing.$(OBJEXT) + $(GETOPT_OBJS) ../non-nettle.$(OBJEXT) timing.$(OBJEXT) nettle-benchmark$(EXEEXT): $(BENCH_OBJS) $(LINK) $(BENCH_OBJS) -lnettle $(BENCH_LIBS) $(OPENSSL_LIBFLAGS) -o nettle-benchmark$(EXEEXT) diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 8fc416df7d11ad53bd3dd58d3c13a263ff64783c..c11023a3e5e2b77c44f08e9506e395c6877930a0 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -103,12 +103,12 @@ all: $(EXTRA_TARGETS) # to use suffix rules to build the test executables. So we use an # explicit rule for each and every executable. -TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) +TEST_OBJS = testutils.$(OBJEXT) ../non-nettle.$(OBJEXT) LIB_HOGWEED = @IF_HOGWEED@ -lhogweed TEST_LIBS = $(LIB_HOGWEED) -lnettle $(LIBS) -../nettle-internal.$(OBJEXT): - ( cd .. && $(MAKE) nettle-internal.$(OBJEXT) ) +../non-nettle.$(OBJEXT): + ( cd .. && $(MAKE) non-nettle.$(OBJEXT) ) # Special target, to omit linking with libnettle dlopen-test$(EXEEXT): dlopen-test.$(OBJEXT) testutils.$(OBJEXT) @@ -121,7 +121,7 @@ cxx-test$(EXEEXT): cxx-test.$(OBJEXT) %$(EXEEXT): %.$(OBJEXT) $(LINK) $< $(TEST_OBJS) $(TEST_LIBS) -o $@ -$(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ +$(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../non-nettle.$(OBJEXT) \ ../libnettle.stamp @IF_HOGWEED@ ../libhogweed.stamp # For use as, e.g.,