--- gvpe/lib/Makefile.in	2004/01/17 01:18:36	1.2
+++ gvpe/lib/Makefile.in	2007/03/29 17:35:20	1.7
@@ -63,6 +63,7 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 HAVE_TUNTAP = @HAVE_TUNTAP@
 IFSUBTYPE = @IFSUBTYPE@
 IFTYPE = @IFTYPE@
@@ -74,6 +75,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_DAEMON = @LDFLAGS_DAEMON@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -100,6 +102,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+ROHC_FALSE = @ROHC_FALSE@
+ROHC_TRUE = @ROHC_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -108,8 +112,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@
@@ -124,22 +126,29 @@
 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 = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -148,12 +157,12 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-noinst_LIBRARIES = libvpe.a
+noinst_LIBRARIES = libgvpe.a
 
-libvpe_a_SOURCES = pidfile.c getopt.c getopt1.c dropin.c
+libgvpe_a_SOURCES = pidfile.c getopt.c getopt1.c dropin.c
 
-libvpe_a_LIBADD = @LIBOBJS@ @ALLOCA@
-libvpe_a_DEPENDENCIES = $(libvpn_a_LIBADD)
+libgvpe_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libgvpe_a_DEPENDENCIES = $(libgvpe_a_LIBADD)
 
 noinst_HEADERS = pidfile.h getopt.h dropin.h gettext.h
 subdir = lib
@@ -163,10 +172,10 @@
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 
-libvpe_a_AR = $(AR) cru
-am_libvpe_a_OBJECTS = pidfile.$(OBJEXT) getopt.$(OBJEXT) \
+libgvpe_a_AR = $(AR) cru
+am_libgvpe_a_OBJECTS = pidfile.$(OBJEXT) getopt.$(OBJEXT) \
 	getopt1.$(OBJEXT) dropin.$(OBJEXT)
-libvpe_a_OBJECTS = $(am_libvpe_a_OBJECTS)
+libgvpe_a_OBJECTS = $(am_libgvpe_a_OBJECTS)
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -178,12 +187,12 @@
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libvpe_a_SOURCES)
+DIST_SOURCES = $(libgvpe_a_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am \
 	alloca.c
-SOURCES = $(libvpe_a_SOURCES)
+SOURCES = $(libgvpe_a_SOURCES)
 
 all: all-am
 
@@ -199,10 +208,10 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libvpe.a: $(libvpe_a_OBJECTS) $(libvpe_a_DEPENDENCIES) 
-	-rm -f libvpe.a
-	$(libvpe_a_AR) libvpe.a $(libvpe_a_OBJECTS) $(libvpe_a_LIBADD)
-	$(RANLIB) libvpe.a
+libgvpe.a: $(libgvpe_a_OBJECTS) $(libgvpe_a_DEPENDENCIES) 
+	-rm -f libgvpe.a
+	$(libgvpe_a_AR) libgvpe.a $(libgvpe_a_OBJECTS) $(libgvpe_a_LIBADD)
+	$(RANLIB) libgvpe.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core