--- gvpe/src/Makefile.am	2004/06/11 15:56:31	1.18
+++ gvpe/src/Makefile.am	2015/01/17 08:35:16	1.30
@@ -1,18 +1,20 @@
 ## Produce this file with automake to get Makefile.in
 
-SUBDIRS = rohc
+#SUBDIRS = rohc
 
 sbin_PROGRAMS = gvpe
 bin_PROGRAMS = gvpectrl
 
-EXTRA_DIST = device-linux.C device-cygwin.C device-tincd.C callback.pl	\
+EXTRA_DIST = device-linux.C device-cygwin.C device-tincd.C device-darwin.C callback.pl	\
    tincd/apply tincd/fixit	\
    tincd/cygwin/device.c tincd/darwin/device.c tincd/freebsd/device.c	\
-   tincd/linux/device.c tincd/mingw/device.c tincd/netbsd/device.c	\
+   tincd/linux/device.c tincd/mingw/common.h tincd/mingw/device.c tincd/netbsd/device.c	\
    tincd/openbsd/device.c tincd/raw_socket/device.c tincd/solaris/device.c \
-   ether_emu.C lzf/lzf_c.c lzf/lzf_d.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-c64.c
 
-INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/libev @INCLUDES@
 
 LIBS = @LIBS@ @LIBINTL@
 
@@ -23,18 +25,21 @@
 endif
 
 COMMON = global.h conf.h conf.C util.h util.C \
-         slog.h slog.C netcompat.h
+         slog.h slog.C netcompat.h ev_cpp.h ev_cpp.C
 
-gvpe_SOURCES = vped.C hash_map.h vpn.h vpn.C vpn_tcp.C vpn_dns.C \
+gvpe_SOURCES = gvpe.C vpn.h vpn.C vpn_tcp.C vpn_dns.C \
                sockinfo.h sockinfo.C \
-               lzf/lzf.h lzf/lzfP.h iom.h iom_conf.h iom.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)
-gvpe_LDADD = $(top_builddir)/lib/libvpe.a $(ROHCLIB)
+gvpe_LDADD = $(top_builddir)/lib/libgvpe.a $(ROHCLIB)
 gvpe_LDFLAGS = @LDFLAGS_DAEMON@
 
-gvpectrl_SOURCES = vpectrl.C $(COMMON)
-gvpectrl_LDADD = $(top_builddir)/lib/libvpe.a
+gvpectrl_SOURCES = gvpectrl.C $(COMMON)
+gvpectrl_LDADD = $(top_builddir)/lib/libgvpe.a
 
 localedir = $(datadir)/locale