--- gvpe/src/Makefile.am	2013/07/16 16:44:36	1.28
+++ gvpe/src/Makefile.am	2018/10/25 07:31:58	1.33
@@ -12,11 +12,11 @@
    tincd/openbsd/device.c tincd/raw_socket/device.c tincd/solaris/device.c \
    tincd/uml_socket/device.c tincd/bsd/device.c \
    ether_emu.C lzf/lzf_c.c lzf/lzf_d.c \
-   curve25519-donna.c
+   curve25519-donna.c curve25519-donna-c64.c
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/libev @INCLUDES@
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/libev @AM_CPPFLAGS@ $(LIBCRYPTO_CFLAGS)
 
-LIBS = @LIBS@ @LIBINTL@
+LIBS = @LIBS@ @LIBINTL@ $(LIBCRYPTO_LIBS)
 
 if ROHC
 ROHCLIB = rohc/librohc.a
@@ -24,12 +24,14 @@
 ROHCLIB =
 endif
 
-COMMON = global.h conf.h conf.C util.h util.C \
-         slog.h slog.C netcompat.h ev_cpp.h ev_cpp.C
+COMMON = global.h conf.h conf.C util.h util.C slog.h slog.C netcompat.h \
+         ev_cpp.h ev_cpp.C crypto.h crypto.C
 
 gvpe_SOURCES = gvpe.C vpn.h vpn.C vpn_tcp.C vpn_dns.C \
                sockinfo.h sockinfo.C \
-               curve25519.h curve25519.C hkdf.h hkdf.C \
+               curve25519.h curve25519.C \
+               iv_gen.h iv_gen.C \
+               hkdf.h hkdf.C \
                lzf/lzf.h lzf/lzfP.h \
                connection.h connection.C callback.h device.h device.C \
                $(COMMON)