--- gvpe/src/Makefile.in	2004/07/07 00:28:20	1.11
+++ gvpe/src/Makefile.in	2005/03/23 17:03:58	1.14
@@ -158,11 +158,12 @@
 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 \
+   tincd/uml_socket/device.c \
    ether_emu.C lzf/lzf_c.c lzf/lzf_d.c
 
 
@@ -173,17 +174,17 @@
          slog.h slog.C netcompat.h
 
 
-gvpe_SOURCES = vped.C hash_map.h vpn.h vpn.C vpn_tcp.C vpn_dns.C \
+gvpe_SOURCES = gvpe.C hash_map.h 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 \
                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
 
@@ -204,26 +205,26 @@
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
 am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT)
-am_gvpe_OBJECTS = vped.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \
+am_gvpe_OBJECTS = gvpe.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \
 	vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) iom.$(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)/device.Po ./$(DEPDIR)/gvpe.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gvpectrl.Po ./$(DEPDIR)/iom.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)
@@ -311,12 +312,12 @@
 @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)/device.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)/iom.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 +404,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/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 \