--- gvpe/src/Makefile.in	2004/02/08 07:24:25	1.6
+++ gvpe/src/Makefile.in	2005/03/25 16:05:22	1.15
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+#SUBDIRS = rohc
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -74,6 +76,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_DAEMON = @LDFLAGS_DAEMON@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -152,33 +155,36 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
-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	\
+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 tincd/bsd/device.c \
    ether_emu.C lzf/lzf_c.c lzf/lzf_d.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
 
 
-vped_SOURCES = vped.C hash_map.h vpn.h vpn.C vpn_tcp.C sockinfo.h sockinfo.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)
 
-vped_LDADD = $(top_builddir)/lib/libvpe.a
-vpectrl_SOURCES = vpectrl.C \
-                  $(COMMON)
+gvpe_LDADD = $(top_builddir)/lib/libgvpe.a $(ROHCLIB)
+gvpe_LDFLAGS = @LDFLAGS_DAEMON@
 
-vpectrl_LDADD = $(top_builddir)/lib/libvpe.a
+gvpectrl_SOURCES = gvpectrl.C $(COMMON)
+gvpectrl_LDADD = $(top_builddir)/lib/libgvpe.a
 
 localedir = $(datadir)/locale
 
@@ -194,31 +200,32 @@
 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) \
-	sockinfo.$(OBJEXT) iom.$(OBJEXT) connection.$(OBJEXT) \
-	device.$(OBJEXT) $(am__objects_1)
-vped_OBJECTS = $(am_vped_OBJECTS)
-vped_DEPENDENCIES = $(top_builddir)/lib/libvpe.a
-vped_LDFLAGS =
+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/libgvpe.a \
+@ROHC_TRUE@	rohc/librohc.a
+@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/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)/vpn_tcp.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)
 CXXLD = $(CXX)
@@ -228,18 +235,11 @@
 	$(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)
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+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_SUBDIRS = $(SUBDIRS)
-SOURCES = $(vpectrl_SOURCES) $(vped_SOURCES)
-
-all: all-recursive
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .C .o .obj
@@ -296,12 +296,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
@@ -312,13 +312,14 @@
 @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@
 
 .C.o:
@@ -344,65 +345,6 @@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 uninstall-info-am:
 
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
 ETAGS = etags
 ETAGSFLAGS =
 
@@ -420,21 +362,10 @@
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -446,7 +377,7 @@
 	     $$tags $$unique
 
 ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -473,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/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 \
@@ -500,38 +431,24 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 check-am: all-am
-check: check-recursive
+check: check-am
 all-am: Makefile $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
 
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -547,22 +464,22 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-sbinPROGRAMS \
 	mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
@@ -570,52 +487,43 @@
 
 install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-man:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
 	uninstall-sbinPROGRAMS
 
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-recursive \
-	clean-sbinPROGRAMS ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-sbinPROGRAMS install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive \
-	uninstall-sbinPROGRAMS
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-sbinPROGRAMS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am uninstall-sbinPROGRAMS
 
 
 dist-hook: