Fixes for make dist.

diff --git a/ChangeLog b/ChangeLog
index c46e258246d461155c333285e87327855f3d2276..0bba729fcce3712196f0998d552b21371f64ddf7 100644 (file)
--- 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 c25cf19075847ce02ce619cb320263cc6e939843..76c3f4f4590ba89d18f2ceb655b0b686de14b928 100644 (file)
--- 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 25c00b1dded8ecc76aa22cbbfced9794249fd8bf..e1390f955b8551a0c54af44d2e82f1584c756e74 100644 (file)
--- 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