--- gvpe/src/Makefile.in	2007/03/29 17:35:20	1.17
+++ gvpe/src/Makefile.in	2007/11/10 05:14:22	1.18
@@ -70,7 +70,7 @@
 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@
@@ -178,12 +178,12 @@
 @ROHC_FALSE@ROHCLIB = 
 
 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 = 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 \
+               lzf/lzf.h lzf/lzfP.h \
                connection.h connection.C callback.h device.h device.C \
                $(COMMON)
 
@@ -209,10 +209,11 @@
 sbin_PROGRAMS = gvpe$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
-am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT)
+am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT) \
+	ev_cpp.$(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)
+	vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) connection.$(OBJEXT) \
+	device.$(OBJEXT) $(am__objects_1)
 gvpe_OBJECTS = $(am_gvpe_OBJECTS)
 @ROHC_TRUE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libgvpe.a \
 @ROHC_TRUE@	rohc/librohc.a
@@ -226,8 +227,8 @@
 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)/gvpe.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gvpectrl.Po ./$(DEPDIR)/iom.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/device.Po ./$(DEPDIR)/ev_cpp.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gvpe.Po ./$(DEPDIR)/gvpectrl.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/slog.Po ./$(DEPDIR)/sockinfo.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/util.Po ./$(DEPDIR)/vpn.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/vpn_dns.Po ./$(DEPDIR)/vpn_tcp.Po
@@ -317,9 +318,9 @@
 @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)/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)/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@