--- gvpe/src/Makefile.in 2004/07/07 00:28:20 1.11 +++ gvpe/src/Makefile.in 2018/10/25 03:13:13 1.26 @@ -65,11 +65,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_TUNTAP = @HAVE_TUNTAP@ IFSUBTYPE = @IFSUBTYPE@ IFTYPE = @IFTYPE@ -INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib +INCLUDES = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/libev @INCLUDES@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -100,6 +101,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ @@ -114,8 +116,6 @@ XGETTEXT = @XGETTEXT@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -130,22 +130,31 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ + +localedir = $(datadir)/locale localstatedir = @localstatedir@ mandir = @mandir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -158,34 +167,37 @@ 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 @ROHC_TRUE@ROHCLIB = rohc/librohc.a @ROHC_FALSE@ROHCLIB = -COMMON = global.h conf.h conf.C util.h util.C \ - slog.h slog.C netcompat.h +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 = 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 - -localedir = $(datadir)/locale +gvpectrl_SOURCES = gvpectrl.C $(COMMON) +gvpectrl_LDADD = $(top_builddir)/lib/libgvpe.a DEFINES = -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\" \ -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \ @@ -203,27 +215,31 @@ sbin_PROGRAMS = gvpe$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) -am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT) -am_gvpe_OBJECTS = vped.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \ - vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) iom.$(OBJEXT) \ - connection.$(OBJEXT) device.$(OBJEXT) $(am__objects_1) +am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT) \ + ev_cpp.$(OBJEXT) crypto.$(OBJEXT) +am_gvpe_OBJECTS = gvpe.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \ + vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) curve25519.$(OBJEXT) \ + iv_gen.$(OBJEXT) hkdf.$(OBJEXT) connection.$(OBJEXT) \ + device.$(OBJEXT) $(am__objects_1) gvpe_OBJECTS = $(am_gvpe_OBJECTS) -@ROHC_TRUE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libvpe.a \ +@ROHC_TRUE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libgvpe.a \ @ROHC_TRUE@ rohc/librohc.a -@ROHC_FALSE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libvpe.a -am_gvpectrl_OBJECTS = vpectrl.$(OBJEXT) $(am__objects_1) +@ROHC_FALSE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libgvpe.a +am_gvpectrl_OBJECTS = gvpectrl.$(OBJEXT) $(am__objects_1) gvpectrl_OBJECTS = $(am_gvpectrl_OBJECTS) -gvpectrl_DEPENDENCIES = $(top_builddir)/lib/libvpe.a +gvpectrl_DEPENDENCIES = $(top_builddir)/lib/libgvpe.a gvpectrl_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Po ./$(DEPDIR)/connection.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/device.Po ./$(DEPDIR)/iom.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/crypto.Po ./$(DEPDIR)/curve25519.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/device.Po ./$(DEPDIR)/ev_cpp.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gvpe.Po ./$(DEPDIR)/gvpectrl.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/hkdf.Po ./$(DEPDIR)/iv_gen.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/slog.Po ./$(DEPDIR)/sockinfo.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/util.Po ./$(DEPDIR)/vpectrl.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/vped.Po ./$(DEPDIR)/vpn.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/util.Po ./$(DEPDIR)/vpn.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/vpn_dns.Po ./$(DEPDIR)/vpn_tcp.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -310,13 +326,17 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve25519.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iom.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ev_cpp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvpe.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvpectrl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hkdf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iv_gen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockinfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpectrl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vped.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpn_dns.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpn_tcp.Po@am__quote@ @@ -403,7 +423,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/lzf $(distdir)/tincd $(distdir)/tincd/cygwin $(distdir)/tincd/darwin $(distdir)/tincd/freebsd $(distdir)/tincd/linux $(distdir)/tincd/mingw $(distdir)/tincd/netbsd $(distdir)/tincd/openbsd $(distdir)/tincd/raw_socket $(distdir)/tincd/solaris + $(mkinstalldirs) $(distdir)/lzf $(distdir)/tincd $(distdir)/tincd/bsd $(distdir)/tincd/cygwin $(distdir)/tincd/darwin $(distdir)/tincd/freebsd $(distdir)/tincd/linux $(distdir)/tincd/mingw $(distdir)/tincd/netbsd $(distdir)/tincd/openbsd $(distdir)/tincd/raw_socket $(distdir)/tincd/solaris $(distdir)/tincd/uml_socket @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \