--- gvpe/src/Makefile.in	2004/06/11 11:31:11	1.9
+++ gvpe/src/Makefile.in	2004/06/11 15:56:31	1.10
@@ -155,8 +155,8 @@
 
 SUBDIRS = rohc
 
-sbin_PROGRAMS = vped
-bin_PROGRAMS = vpectrl
+sbin_PROGRAMS = gvpe
+bin_PROGRAMS = gvpectrl
 
 EXTRA_DIST = device-linux.C device-cygwin.C device-tincd.C callback.pl	\
    tincd/apply tincd/fixit	\
@@ -173,19 +173,17 @@
          slog.h slog.C netcompat.h
 
 
-vped_SOURCES = vped.C hash_map.h vpn.h vpn.C vpn_tcp.C vpn_dns.C \
+gvpe_SOURCES = vped.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)
 
-vped_LDADD = $(top_builddir)/lib/libvpe.a $(ROHCLIB)
-vped_LDFLAGS = @LDFLAGS_DAEMON@
+gvpe_LDADD = $(top_builddir)/lib/libvpe.a $(ROHCLIB)
+gvpe_LDFLAGS = @LDFLAGS_DAEMON@
 
-vpectrl_SOURCES = vpectrl.C \
-                  $(COMMON)
-
-vpectrl_LDADD = $(top_builddir)/lib/libvpe.a
+gvpectrl_SOURCES = vpectrl.C $(COMMON)
+gvpectrl_LDADD = $(top_builddir)/lib/libvpe.a
 
 localedir = $(datadir)/locale
 
@@ -201,22 +199,22 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-bin_PROGRAMS = vpectrl$(EXEEXT)
-sbin_PROGRAMS = vped$(EXEEXT)
+bin_PROGRAMS = gvpectrl$(EXEEXT)
+sbin_PROGRAMS = gvpe$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
 am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT)
-am_vpectrl_OBJECTS = vpectrl.$(OBJEXT) $(am__objects_1)
-vpectrl_OBJECTS = $(am_vpectrl_OBJECTS)
-vpectrl_DEPENDENCIES = $(top_builddir)/lib/libvpe.a
-vpectrl_LDFLAGS =
-am_vped_OBJECTS = vped.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(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)
-vped_OBJECTS = $(am_vped_OBJECTS)
-@ROHC_TRUE@vped_DEPENDENCIES = $(top_builddir)/lib/libvpe.a \
+gvpe_OBJECTS = $(am_gvpe_OBJECTS)
+@ROHC_TRUE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libvpe.a \
 @ROHC_TRUE@	rohc/librohc.a
-@ROHC_FALSE@vped_DEPENDENCIES = $(top_builddir)/lib/libvpe.a
+@ROHC_FALSE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libvpe.a
+am_gvpectrl_OBJECTS = vpectrl.$(OBJEXT) $(am__objects_1)
+gvpectrl_OBJECTS = $(am_gvpectrl_OBJECTS)
+gvpectrl_DEPENDENCIES = $(top_builddir)/lib/libvpe.a
+gvpectrl_LDFLAGS =
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -236,16 +234,16 @@
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(vpectrl_SOURCES) $(vped_SOURCES)
+DIST_SOURCES = $(gvpe_SOURCES) $(gvpectrl_SOURCES)
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
 	all-recursive install-data-recursive install-exec-recursive \
 	installdirs-recursive install-recursive uninstall-recursive \
 	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(vpectrl_SOURCES) $(vped_SOURCES)
+SOURCES = $(gvpe_SOURCES) $(gvpectrl_SOURCES)
 
 all: all-recursive
 
@@ -304,12 +302,12 @@
 
 clean-sbinPROGRAMS:
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
-vpectrl$(EXEEXT): $(vpectrl_OBJECTS) $(vpectrl_DEPENDENCIES) 
-	@rm -f vpectrl$(EXEEXT)
-	$(CXXLINK) $(vpectrl_LDFLAGS) $(vpectrl_OBJECTS) $(vpectrl_LDADD) $(LIBS)
-vped$(EXEEXT): $(vped_OBJECTS) $(vped_DEPENDENCIES) 
-	@rm -f vped$(EXEEXT)
-	$(CXXLINK) $(vped_LDFLAGS) $(vped_OBJECTS) $(vped_LDADD) $(LIBS)
+gvpe$(EXEEXT): $(gvpe_OBJECTS) $(gvpe_DEPENDENCIES) 
+	@rm -f gvpe$(EXEEXT)
+	$(CXXLINK) $(gvpe_LDFLAGS) $(gvpe_OBJECTS) $(gvpe_LDADD) $(LIBS)
+gvpectrl$(EXEEXT): $(gvpectrl_OBJECTS) $(gvpectrl_DEPENDENCIES) 
+	@rm -f gvpectrl$(EXEEXT)
+	$(CXXLINK) $(gvpectrl_LDFLAGS) $(gvpectrl_OBJECTS) $(gvpectrl_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -632,4 +630,3 @@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-#Hi