--- gvpe/src/Makefile.am	2003/10/16 14:12:00	1.11
+++ gvpe/src/Makefile.am	2004/04/02 14:42:45	1.16
@@ -1,5 +1,7 @@
 ## Produce this file with automake to get Makefile.in
 
+SUBDIRS = rohc
+
 sbin_PROGRAMS = vped
 bin_PROGRAMS = vpectrl
 
@@ -7,21 +9,28 @@
    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/openbsd/device.c tincd/raw_socket/device.c tincd/solaris/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 \
+vped_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
+vped_LDADD = $(top_builddir)/lib/libvpe.a $(ROHCLIB)
 vpectrl_SOURCES = vpectrl.C \
                   $(COMMON)
 vpectrl_LDADD = $(top_builddir)/lib/libvpe.a