From 7c29acabe0992c6b6e666a95e5bf95b44c4e980e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 22 Dec 2008 16:21:23 +0100
Subject: [PATCH] ($(des_headers)): Create files in $(srcdir).
Rev: nettle/ChangeLog:1.30
Rev: nettle/Makefile.in:1.8
---
ChangeLog | 4 ++++
Makefile.in | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7dd67fbc..6051a223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-22 Niels M�ller <nisse@lysator.liu.se>
+
+ * Makefile.in ($(des_headers)): Create files in $(srcdir).
+
2008-11-28 Niels M�ller <nisse@lysator.liu.se>
* testsuite/cxx-test.cxx: Include <cstdio>.
diff --git a/Makefile.in b/Makefile.in
index 66664295..aca4fda0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ SUBDIRS = tools testsuite examples
include config.make
PRE_CPPFLAGS = -I.
+# FIXME: Add configuration of LIBEXT?
LIBTARGETS = libnettle.a @IF_HOGWEED@ libhogweed.a
SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
@@ -178,8 +179,9 @@ des_headers = parity.h rotors.h keymap.h
# Generate DES headers.
$(des_headers): desdata.c
$(MAKE) desdata$(EXEEXT)
- ./desdata$(EXEEXT) $(@F) > $@T
- test -s $@T && mv -f $@T $@
+ f="$(srcdir)/`basename $@`"; \
+ ./desdata$(EXEEXT) $(@F) > $${f}T; \
+ test -s $${f}T && mv -f $${f}T $$f
des.$(OBJEXT): des.c des.h $(des_headers)
@@ -302,7 +304,7 @@ uninstall-here: uninstall-info uninstall-headers uninstall-static \
@IF_SHARED@ uninstall-shared
uninstall-static:
- for f in $(STATIC_LIBS) ; do \
+ for f in $(LIBTARGETS) ; do \
rm -f $(DESTDIR)$(libdir)/$$f ; \
done
--
GitLab