--- gvpe/src/Makefile.am	2004/01/29 19:22:05	1.14
+++ gvpe/src/Makefile.am	2004/06/19 14:22:17	1.19
@@ -1,7 +1,9 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = vped
-bin_PROGRAMS = vpectrl
+#SUBDIRS = rohc
+
+sbin_PROGRAMS = gvpe
+bin_PROGRAMS = gvpectrl
 
 EXTRA_DIST = device-linux.C device-cygwin.C device-tincd.C callback.pl	\
    tincd/apply tincd/fixit	\
@@ -14,17 +16,25 @@
 
 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 \
+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
-vpectrl_SOURCES = vpectrl.C \
-                  $(COMMON)
-vpectrl_LDADD = $(top_builddir)/lib/libvpe.a
+gvpe_LDADD = $(top_builddir)/lib/libvpe.a $(ROHCLIB)
+gvpe_LDFLAGS = @LDFLAGS_DAEMON@
+
+gvpectrl_SOURCES = vpectrl.C $(COMMON)
+gvpectrl_LDADD = $(top_builddir)/lib/libvpe.a
 
 localedir = $(datadir)/locale