--- gvpe/src/Makefile.in 2004/01/29 19:22:05 1.5 +++ gvpe/src/Makefile.in 2011/02/15 13:31:23 1.19 @@ -14,6 +14,8 @@ @SET_MAKE@ +#SUBDIRS = rohc + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -63,17 +65,19 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_TUNTAP = @HAVE_TUNTAP@ IFSUBTYPE = @IFSUBTYPE@ IFTYPE = @IFTYPE@ -INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib +INCLUDES = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/libev @INCLUDES@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ +LDFLAGS_DAEMON = @LDFLAGS_DAEMON@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ @@ -97,10 +101,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +ROHC_FALSE = @ROHC_FALSE@ +ROHC_TRUE = @ROHC_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -109,8 +116,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@ @@ -125,22 +130,30 @@ 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 = $(datadir)/locale localstatedir = @localstatedir@ mandir = @mandir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -150,33 +163,36 @@ target_os = @target_os@ target_vendor = @target_vendor@ -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 + slog.h slog.C netcompat.h ev_cpp.h ev_cpp.C -vped_SOURCES = vped.C hash_map.h vpn.h vpn.C vpn_tcp.C sockinfo.h sockinfo.C \ - lzf/lzf.h lzf/lzfP.h iom.h iom_conf.h iom.C \ +gvpe_SOURCES = gvpe.C vpn.h vpn.C vpn_tcp.C vpn_dns.C \ + sockinfo.h sockinfo.C \ + lzf/lzf.h lzf/lzfP.h \ 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@ -localedir = $(datadir)/locale +gvpectrl_SOURCES = gvpectrl.C $(COMMON) +gvpectrl_LDADD = $(top_builddir)/lib/libgvpe.a DEFINES = -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\" \ -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \ @@ -190,31 +206,33 @@ 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) \ +am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT) \ + ev_cpp.$(OBJEXT) +am_gvpe_OBJECTS = gvpe.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \ + vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) connection.$(OBJEXT) \ device.$(OBJEXT) $(am__objects_1) -vped_OBJECTS = $(am_vped_OBJECTS) -vped_DEPENDENCIES = $(top_builddir)/lib/libvpe.a -vped_LDFLAGS = +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)/ev_cpp.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gvpe.Po ./$(DEPDIR)/gvpectrl.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) @@ -224,9 +242,9 @@ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(vpectrl_SOURCES) $(vped_SOURCES) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO -SOURCES = $(vpectrl_SOURCES) $(vped_SOURCES) +DIST_SOURCES = $(gvpe_SOURCES) $(gvpectrl_SOURCES) +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +SOURCES = $(gvpe_SOURCES) $(gvpectrl_SOURCES) all: all-am @@ -285,12 +303,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 @@ -301,13 +319,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)/iom.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ev_cpp.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)/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: @@ -392,7 +411,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 \