Skip to content
Snippets Groups Projects
Commit bf6da6f0 authored by Martin Storsjö's avatar Martin Storsjö Committed by Niels Möller
Browse files

Cygwin/mingw32 improvements contributed by Martin Storsjö:

* Makefile.in (IMPLICIT_TARGETS): New variable for DLL link
libraries.
(clean-here): Delete the DLL import libraries.

Rev: nettle/ChangeLog:1.231
Rev: nettle/Makefile.in:1.42
parent cb943f55
Branches
Tags
No related merge requests found
2011-11-19 Niels Mller <nisse@lysator.liu.se> 2011-11-19 Niels Mller <nisse@lysator.liu.se>
Cygwin/mingw32 improvements contributed by Martin Storsj: 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 (IF_DLL, LIBNETTLE_FILE_SRC, LIBHOGWEED_FILE_SRC): New
substitutions. substitutions.
...@@ -10,7 +14,7 @@ ...@@ -10,7 +14,7 @@
(LIBHOGWEED_FILE_SRC): Likewise. (LIBHOGWEED_FILE_SRC): Likewise.
* Makefile.in (install-dll-nettle, uninstall-dll-nettle): New * 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 (install-shared-nettle): Conditionally
depend on install-dll-nettle. Use LIBNETTLE_FILE_SRC. depend on install-dll-nettle. Use LIBNETTLE_FILE_SRC.
(uninstall-shared-nettle): Conditionally depend on (uninstall-shared-nettle): Conditionally depend on
......
...@@ -25,6 +25,7 @@ SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) ...@@ -25,6 +25,7 @@ SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) gcmdata$(EXEEXT)\ TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) gcmdata$(EXEEXT)\
$(LIBTARGETS) @IF_SHARED@ $(SHLIBTARGETS) $(LIBTARGETS) @IF_SHARED@ $(SHLIBTARGETS)
IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
DOCTARGETS = nettle.info nettle.html nettle.pdf DOCTARGETS = nettle.info nettle.html nettle.pdf
...@@ -455,7 +456,7 @@ distcheck: dist ...@@ -455,7 +456,7 @@ distcheck: dist
$(rm_distcheck) $(rm_distcheck)
clean-here: clean-here:
-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s
-rm -rf .lib -rm -rf .lib
distclean-here: clean-here distclean-here: clean-here
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment