--- gvpe/src/Makefile.in 2004/01/29 19:22:05 1.5 +++ gvpe/src/Makefile.in 2005/03/17 23:59:37 1.12 @@ -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@ @@ -101,6 +104,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +ROHC_FALSE = @ROHC_FALSE@ +ROHC_TRUE = @ROHC_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -150,31 +155,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 \ 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 \ 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 = 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) +gvpe_LDADD = $(top_builddir)/lib/libvpe.a $(ROHCLIB) +gvpe_LDFLAGS = @LDFLAGS_DAEMON@ -vpectrl_LDADD = $(top_builddir)/lib/libvpe.a +gvpectrl_SOURCES = vpectrl.C $(COMMON) +gvpectrl_LDADD = $(top_builddir)/lib/libvpe.a localedir = $(datadir)/locale @@ -190,21 +200,22 @@ 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 = vped.$(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/libvpe.a \ +@ROHC_TRUE@ rohc/librohc.a +@ROHC_FALSE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libvpe.a +am_gvpectrl_OBJECTS = vpectrl.$(OBJEXT) $(am__objects_1) +gvpectrl_OBJECTS = $(am_gvpectrl_OBJECTS) +gvpectrl_DEPENDENCIES = $(top_builddir)/lib/libvpe.a +gvpectrl_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -214,7 +225,7 @@ @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)/vpn_dns.Po ./$(DEPDIR)/vpn_tcp.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -224,9 +235,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 +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 @@ -308,6 +319,7 @@ @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 +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/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 \