From 214a452223d40dba342e2ddd01236643c687f618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 19 Nov 2011 15:22:47 +0100 Subject: [PATCH] =?UTF-8?q?Cygwin/mingw32=20improvements=20contributed=20b?= =?UTF-8?q?y=20Martin=20Storsj=C3=B6:=20*=20Makefile.in=20(IMPLICIT=5FTARG?= =?UTF-8?q?ETS):=20New=20variable=20for=20DLL=20link=20libraries.=20(clean?= =?UTF-8?q?-here):=20Delete=20the=20DLL=20import=20libraries.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rev: nettle/ChangeLog:1.231 Rev: nettle/Makefile.in:1.42 --- nettle/ChangeLog | 8 ++++++-- nettle/Makefile.in | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nettle/ChangeLog b/nettle/ChangeLog index bbbb4e7d..b8fb1abb 100644 --- a/nettle/ChangeLog +++ b/nettle/ChangeLog @@ -1,7 +1,11 @@ 2011-11-19 Niels Möller Cygwin/mingw32 improvements contributed by Martin Storsjö: - * configure.ac: Setup installation of dll files in $bindir. + * Makefile.in (IMPLICIT_TARGETS): New variable for DLL link + libraries. + (clean-here): Delete the DLL import libraries. + + * configure.ac: Setup installation of DLL files in $bindir. (IF_DLL, LIBNETTLE_FILE_SRC, LIBHOGWEED_FILE_SRC): New substitutions. @@ -10,7 +14,7 @@ (LIBHOGWEED_FILE_SRC): Likewise. * Makefile.in (install-dll-nettle, uninstall-dll-nettle): New - target for installing the dll file in $bindir. + target for installing the DLL file in $bindir. (install-shared-nettle): Conditionally depend on install-dll-nettle. Use LIBNETTLE_FILE_SRC. (uninstall-shared-nettle): Conditionally depend on diff --git a/nettle/Makefile.in b/nettle/Makefile.in index a954f7fe..c771f112 100644 --- a/nettle/Makefile.in +++ b/nettle/Makefile.in @@ -25,6 +25,7 @@ SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) gcmdata$(EXEEXT)\ $(LIBTARGETS) @IF_SHARED@ $(SHLIBTARGETS) +IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE) DOCTARGETS = nettle.info nettle.html nettle.pdf @@ -455,7 +456,7 @@ distcheck: dist $(rm_distcheck) clean-here: - -rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s + -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s -rm -rf .lib distclean-here: clean-here -- 2.26.2