fix compilation with latest automake

diff --git a/Makefile.am b/Makefile.am
index 61b5a1d999a8696bf3a6b8c7ee542197f3d20eb5..90065c75bd9dd32b7ec00b8385dc2b2ba3187228 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,9 +52,8 @@ else
 libykpers_1_la_SOURCES += ykpers-nojson.c
 endif
 libykpers_1_la_SOURCES += ykpers_lcl.h ykpers-json.h ykpers_lcl.c
-libykpers_1_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h  \
-       rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c        \
-       rfc4634/sha-private.h
+libykpers_1_la_SOURCES += hmac.c usha.c sha.h sha1.c sha224-256.c \
+       sha384-512.c sha-private.h
 libykpers_1_la_SOURCES += ykpers-1.pc.in libykpers-1.map
 libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la $(libjson_LIBS)
 libykpers_1_la_LDFLAGS = -no-undefined \

diff --git a/rfc4634/hmac.c b/hmac.c
similarity index 100%
rename from rfc4634/hmac.c
rename to hmac.c

diff --git a/rfc4634/sha-private.h b/sha-private.h
similarity index 100%
rename from rfc4634/sha-private.h
rename to sha-private.h

diff --git a/rfc4634/sha.h b/sha.h
similarity index 100%
rename from rfc4634/sha.h
rename to sha.h

diff --git a/rfc4634/sha1.c b/sha1.c
similarity index 100%
rename from rfc4634/sha1.c
rename to sha1.c

diff --git a/rfc4634/sha224-256.c b/sha224-256.c
similarity index 100%
rename from rfc4634/sha224-256.c
rename to sha224-256.c

diff --git a/rfc4634/sha384-512.c b/sha384-512.c
similarity index 100%
rename from rfc4634/sha384-512.c
rename to sha384-512.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9f256df40355ffa968ae2928fe6cb61dd0e1f848..6fb6edb7580dba4a8b1d254695816a8c2f6eaf02 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,6 @@ check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
 
 test_args_to_config_SOURCES = test_args_to_config.c \
-       ../ykpers-args.h ../ykpers-args.c
+       ykpers-args.h ykpers-args.c
 
 TESTS_ENVIRONMENT = $(VALGRIND)

diff --git a/tests/ykpers-args.c b/tests/ykpers-args.c
new file mode 120000 (symlink)
index 0000000..d67d3ef
--- /dev/null
+++ b/tests/ykpers-args.c
@@ -0,0 +1 @@
+../ykpers-args.c
\ No newline at end of file

diff --git a/tests/ykpers-args.h b/tests/ykpers-args.h
new file mode 120000 (symlink)
index 0000000..2468d43
--- /dev/null
+++ b/tests/ykpers-args.h
@@ -0,0 +1 @@
+../ykpers-args.h
\ No newline at end of file

diff --git a/rfc4634/usha.c b/usha.c
similarity index 100%
rename from rfc4634/usha.c
rename to usha.c

diff --git a/ykpbkdf2.c b/ykpbkdf2.c
index 394751d3a9bbaf64a3010c14733792c0eaec781d..4e36594c369dc4d6fffd3b28bfd09e1b940b0380 100644 (file)
--- a/ykpbkdf2.c
+++ b/ykpbkdf2.c
@@ -31,7 +31,7 @@
 
 #include <ykpbkdf2.h>
 
-#include "rfc4634/sha.h"
+#include "sha.h"
 
 int yk_hmac_sha1(const char *key, size_t key_len,
                     const char *text, size_t text_len,