Commit 7c29acab authored by Niels Möller's avatar Niels Möller
Browse files

($(des_headers)): Create files in $(srcdir).

Rev: nettle/ChangeLog:1.30
Rev: nettle/Makefile.in:1.8
parent 6b3b389f
2008-12-22 Niels Mller <nisse@lysator.liu.se>
* Makefile.in ($(des_headers)): Create files in $(srcdir).
2008-11-28 Niels Mller <nisse@lysator.liu.se> 2008-11-28 Niels Mller <nisse@lysator.liu.se>
* testsuite/cxx-test.cxx: Include <cstdio>. * testsuite/cxx-test.cxx: Include <cstdio>.
......
...@@ -19,6 +19,7 @@ SUBDIRS = tools testsuite examples ...@@ -19,6 +19,7 @@ SUBDIRS = tools testsuite examples
include config.make include config.make
PRE_CPPFLAGS = -I. PRE_CPPFLAGS = -I.
# FIXME: Add configuration of LIBEXT?
LIBTARGETS = libnettle.a @IF_HOGWEED@ libhogweed.a LIBTARGETS = libnettle.a @IF_HOGWEED@ libhogweed.a
SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
...@@ -178,8 +179,9 @@ des_headers = parity.h rotors.h keymap.h ...@@ -178,8 +179,9 @@ des_headers = parity.h rotors.h keymap.h
# Generate DES headers. # Generate DES headers.
$(des_headers): desdata.c $(des_headers): desdata.c
$(MAKE) desdata$(EXEEXT) $(MAKE) desdata$(EXEEXT)
./desdata$(EXEEXT) $(@F) > $@T f="$(srcdir)/`basename $@`"; \
test -s $@T && mv -f $@T $@ ./desdata$(EXEEXT) $(@F) > $${f}T; \
test -s $${f}T && mv -f $${f}T $$f
des.$(OBJEXT): des.c des.h $(des_headers) des.$(OBJEXT): des.c des.h $(des_headers)
...@@ -302,7 +304,7 @@ uninstall-here: uninstall-info uninstall-headers uninstall-static \ ...@@ -302,7 +304,7 @@ uninstall-here: uninstall-info uninstall-headers uninstall-static \
@IF_SHARED@ uninstall-shared @IF_SHARED@ uninstall-shared
uninstall-static: uninstall-static:
for f in $(STATIC_LIBS) ; do \ for f in $(LIBTARGETS) ; do \
rm -f $(DESTDIR)$(libdir)/$$f ; \ rm -f $(DESTDIR)$(libdir)/$$f ; \
done done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment