--- gvpe/src/Makefile.am	2003/10/16 14:12:00	1.11
+++ gvpe/src/Makefile.am	2005/03/25 16:05:22	1.25
@@ -1,30 +1,41 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = vped
-bin_PROGRAMS = vpectrl
+#SUBDIRS = rohc
 
-EXTRA_DIST = device-linux.C device-cygwin.C device-tincd.C callback.pl	\
+sbin_PROGRAMS = gvpe
+bin_PROGRAMS = gvpectrl
+
+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/openbsd/device.c tincd/raw_socket/device.c tincd/solaris/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
 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
 
 LIBS = @LIBS@ @LIBINTL@
 
+if ROHC
+ROHCLIB = rohc/librohc.a
+else
+ROHCLIB =
+endif
+
 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 \
-               lzf/lzf.h lzf/lzfP.h lzf/lzf_c.c lzf/lzf_d.c iom.h iom.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)
-vpectrl_LDADD = $(top_builddir)/lib/libvpe.a
+gvpe_LDADD = $(top_builddir)/lib/libgvpe.a $(ROHCLIB)
+gvpe_LDFLAGS = @LDFLAGS_DAEMON@
+
+gvpectrl_SOURCES = gvpectrl.C $(COMMON)
+gvpectrl_LDADD = $(top_builddir)/lib/libgvpe.a
 
 localedir = $(datadir)/locale