From 2f742c694fd991e7ade60754bf855ab0fd787793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 11 Apr 2014 15:27:29 +0200
Subject: [PATCH] Fixes for make dist.

---
 ChangeLog         | 6 ++++++
 Makefile.in       | 2 +-
 tools/Makefile.in | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c46e2582..0bba729f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-11  Niels Möller  <nisse@lysator.liu.se>
+
+	* Makefile.in (DISTFILES): Deleted memxor.c, already included via
+	nettle_SOURCES.
+	* tools/Makefile.in (SOURCES): Add nettle-pbkdf2.c.
+
 2014-04-10  Niels Möller  <nisse@lysator.liu.se>
 
 	From Nikos Mavrogiannopoulos:
diff --git a/Makefile.in b/Makefile.in
index c25cf190..76c3f4f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -199,7 +199,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h .bootstrap run-tests \
 	config.h.in config.m4.in config.make.in	Makefile.in \
 	README AUTHORS COPYING.LIB INSTALL NEWS TODO ChangeLog \
 	nettle.pc.in hogweed.pc.in \
-	memxor.c $(des_headers) descore.README \
+	$(des_headers) descore.README \
 	aes-internal.h camellia-internal.h serpent-internal.h \
 	cast128_sboxes.h desinfo.h desCode.h \
 	nettle-internal.h nettle-write.h prime-list.h \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 25c00b1d..e1390f95 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -31,7 +31,7 @@ pkcs1_conv_SOURCES = pkcs1-conv.c misc.c
 nettle_hash_SOURCES = nettle-hash.c misc.c
 nettle_pbkdf2_SOURCES = nettle-pbkdf2.c misc.c
 
-SOURCES = $(sexp_conv_SOURCES) nettle-hash.c nettle-lfib-stream.c pkcs1-conv.c
+SOURCES = $(sexp_conv_SOURCES) nettle-hash.c nettle-lfib-stream.c pkcs1-conv.c nettle-pbkdf2.c
 
 DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
 
-- 
GitLab