From 59b427a56e4b6baf134227f8c572731419e707da Mon Sep 17 00:00:00 2001 From: Shinya TAKEBAYASHI Date: Mon, 11 May 2009 13:21:16 +0900 Subject: [PATCH] Updated autotools' files --- configure | 2 +- debian/Makefile | 20 ++-- debian/Makefile.in | 4 +- l7directord/Makefile.in | 4 +- man/Makefile.in | 4 +- module/Makefile.in | 4 +- module/protocol/Makefile.in | 256 +++++++++++++++++--------------------------- 7 files changed, 119 insertions(+), 175 deletions(-) diff --git a/configure b/configure index fc32378..e546f5e 100755 --- a/configure +++ b/configure @@ -1503,7 +1503,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu PACKAGENAME=l7vsd -VERSION=2.1.1-0 +VERSION=2.1.2-2 GLIB_REQUIRED_VERSION=2.0.0 am__api_version="1.9" diff --git a/debian/Makefile b/debian/Makefile index abe7198..7d39e09 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -47,14 +47,14 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/missing --run tar +AMTAR = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/missing --run automake-1.9 +AUTOCONF = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/missing --run automake-1.9 AWK = gawk CC = g++ CCDEPMODE = depmode=gcc3 @@ -91,7 +91,7 @@ LIBS = -ldl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/missing --run makeinfo MANDIR = OBJEXT = o PACKAGE = l7vsd @@ -107,7 +107,7 @@ SED = /bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 2.1.1-0 +VERSION = 2.1.2-2 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -138,7 +138,7 @@ host_os = linux-gnu host_vendor = pc includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.1/install-sh +install_sh = /usr/src/redhat/SOURCES/ultramonkey-l7-2.1.2/install-sh l7vs_maxvs = 64 l7vs_moddir = /usr/lib/l7vs l7vsadm_sockdir = /var/run/l7vs @@ -176,9 +176,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu debian/Makefile + $(AUTOMAKE) --foreign debian/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/debian/Makefile.in b/debian/Makefile.in index fb1254b..72d19fa 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -176,9 +176,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu debian/Makefile + $(AUTOMAKE) --foreign debian/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/l7directord/Makefile.in b/l7directord/Makefile.in index 08ff213..7ceb774 100644 --- a/l7directord/Makefile.in +++ b/l7directord/Makefile.in @@ -172,9 +172,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu l7directord/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign l7directord/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu l7directord/Makefile + $(AUTOMAKE) --foreign l7directord/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/Makefile.in b/man/Makefile.in index c8d9a64..618a7cb 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -167,9 +167,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/module/Makefile.in b/module/Makefile.in index 8e0e3cd..de58f11 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -177,9 +177,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu module/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign module/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu module/Makefile + $(AUTOMAKE) --foreign module/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/module/protocol/Makefile.in b/module/protocol/Makefile.in index 7e78fa4..7a459ea 100644 --- a/module/protocol/Makefile.in +++ b/module/protocol/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,11 +14,15 @@ @SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,18 +54,12 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libprotomod_cinsert_la_DEPENDENCIES = -am_libprotomod_cinsert_la_OBJECTS = protomod_cinsert.lo module_http.lo -libprotomod_cinsert_la_OBJECTS = $(am_libprotomod_cinsert_la_OBJECTS) -libprotomod_cpassive_la_DEPENDENCIES = -am_libprotomod_cpassive_la_OBJECTS = protomod_cpassive.lo module_http.lo -libprotomod_cpassive_la_OBJECTS = $(am_libprotomod_cpassive_la_OBJECTS) -libprotomod_crewrite_la_DEPENDENCIES = -am_libprotomod_crewrite_la_OBJECTS = protomod_crewrite.lo module_http.lo -libprotomod_crewrite_la_OBJECTS = $(am_libprotomod_crewrite_la_OBJECTS) libprotomod_ip_la_DEPENDENCIES = am_libprotomod_ip_la_OBJECTS = protomod_ip.lo module_http.lo libprotomod_ip_la_OBJECTS = $(am_libprotomod_ip_la_OBJECTS) +libprotomod_pfilter_la_DEPENDENCIES = +am_libprotomod_pfilter_la_OBJECTS = protomod_pfilter.lo +libprotomod_pfilter_la_OBJECTS = $(am_libprotomod_pfilter_la_OBJECTS) libprotomod_sessionless_la_DEPENDENCIES = am_libprotomod_sessionless_la_OBJECTS = protomod_sessionless.lo \ module_http.lo @@ -74,52 +72,39 @@ libprotomod_sslid_la_OBJECTS = $(am_libprotomod_sslid_la_OBJECTS) libprotomod_url_la_DEPENDENCIES = am_libprotomod_url_la_OBJECTS = protomod_url.lo module_http.lo libprotomod_url_la_OBJECTS = $(am_libprotomod_url_la_OBJECTS) -libprotomod_pfilter_la_DEPENDENCIES = -am_libprotomod_pfilter_la_OBJECTS = protomod_pfilter.lo -libprotomod_pfilter_la_OBJECTS = $(am_libprotomod_pfilter_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = \ - $(libprotomod_cinsert_la_SOURCES) \ - $(libprotomod_cpassive_la_SOURCES) \ - $(libprotomod_crewrite_la_SOURCES) \ - $(libprotomod_ip_la_SOURCES) \ +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libprotomod_ip_la_SOURCES) \ + $(libprotomod_pfilter_la_SOURCES) \ $(libprotomod_sessionless_la_SOURCES) \ - $(libprotomod_sslid_la_SOURCES) \ - $(libprotomod_url_la_SOURCES) \ - $(libprotomod_pfilter_la_SOURCES) -DIST_SOURCES = \ - $(libprotomod_cinsert_la_SOURCES) \ - $(libprotomod_cpassive_la_SOURCES) \ - $(libprotomod_crewrite_la_SOURCES) \ - $(libprotomod_ip_la_SOURCES) \ + $(libprotomod_sslid_la_SOURCES) $(libprotomod_url_la_SOURCES) +DIST_SOURCES = $(libprotomod_ip_la_SOURCES) \ + $(libprotomod_pfilter_la_SOURCES) \ $(libprotomod_sessionless_la_SOURCES) \ - $(libprotomod_sslid_la_SOURCES) \ - $(libprotomod_url_la_SOURCES) \ - $(libprotomod_pfilter_la_SOURCES) + $(libprotomod_sslid_la_SOURCES) $(libprotomod_url_la_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -138,7 +123,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -152,8 +136,6 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GOBJECT_QUERY = @GOBJECT_QUERY@ -GREP = @GREP@ -INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -166,8 +148,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANDIR = @MANDIR@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -183,13 +163,16 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +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@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -201,18 +184,13 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ 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@ @@ -221,50 +199,36 @@ l7vs_moddir = @l7vs_moddir@ l7vsadm_sockdir = @l7vsadm_sockdir@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ snmpagent_libs = @snmpagent_libs@ -srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign L7VS_MODDIR = @l7vs_moddir@ AM_CFLAGS = -fPIC $(GLIB_CFLAGS) -I../../include -I../../logger AM_CPPFLAGS = -fPIC $(GLIB_CFLAGS) -I../../include -I../../logger lib_LTLIBRARIES = \ - libprotomod_cinsert.la \ - libprotomod_cpassive.la \ - libprotomod_crewrite.la \ - libprotomod_ip.la \ libprotomod_url.la \ libprotomod_pfilter.la \ libprotomod_sslid.la \ + libprotomod_ip.la \ libprotomod_sessionless.la -libprotomod_cinsert_la_SOURCES = protomod_cinsert.c module_http.c module_http.h -libprotomod_cinsert_la_LIBADD = $(GLIB_LIB) -lrt -libprotomod_cpassive_la_SOURCES = protomod_cpassive.c module_http.c module_http.h -libprotomod_cpassive_la_LIBADD = $(GLIB_LIB) -lrt -libprotomod_crewrite_la_SOURCES = protomod_crewrite.c module_http.c module_http.h -libprotomod_crewrite_la_LIBADD = $(GLIB_LIB) -lrt -libprotomod_ip_la_SOURCES = protomod_ip.c module_http.c module_http.h -libprotomod_ip_la_LIBADD = $(GLIB_LIB) -lrt -libprotomod_sslid_la_SOURCES = protomod_sslid.c protomod_sslid.h module_http.c module_http.h module_sslid_hash.cpp module_sslid_hash.h module_sslid_hash_map.cpp module_sslid_hash_map.h + +libprotomod_sslid_la_SOURCES = protomod_sslid.c protomod_sslid.h module_http.c module_http.h module_sslid_hash.cpp module_sslid_hash.h module_sslid_hash_map.cpp module_sslid_hash_map.h libprotomod_sslid_la_LIBADD = $(GLIB_LIB) -lrt libprotomod_url_la_SOURCES = protomod_url.c module_http.c module_http.h libprotomod_url_la_LIBADD = $(GLIB_LIB) -lrt -lboost_regex -libprotomod_pfilter_la_SOURCES = protomod_pfilter.c +libprotomod_pfilter_la_SOURCES = protomod_pfilter.c libprotomod_pfilter_la_LIBADD = $(GLIB_LIB) -lrt -lboost_regex +libprotomod_ip_la_SOURCES = protomod_ip.c module_http.c module_http.h +libprotomod_ip_la_LIBADD = $(GLIB_LIB) -lrt libprotomod_sessionless_la_SOURCES = protomod_sessionless.c module_http.c module_http.h libprotomod_sessionless_la_LIBADD = $(GLIB_LIB) -lrt all: all-am @@ -302,21 +266,21 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -327,22 +291,16 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libprotomod_cinsert.la: $(libprotomod_cinsert_la_OBJECTS) $(libprotomod_cinsert_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libprotomod_cinsert_la_OBJECTS) $(libprotomod_cinsert_la_LIBADD) $(LIBS) -libprotomod_cpassive.la: $(libprotomod_cpassive_la_OBJECTS) $(libprotomod_cpassive_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libprotomod_cpassive_la_LDFLAGS) $(libprotomod_cpassive_la_OBJECTS) $(libprotomod_cpassive_la_LIBADD) $(LIBS) -libprotomod_crewrite.la: $(libprotomod_crewrite_la_OBJECTS) $(libprotomod_crewrite_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libprotomod_crewrite_la_LDFLAGS) $(libprotomod_crewrite_la_OBJECTS) $(libprotomod_crewrite_la_LIBADD) $(LIBS) libprotomod_ip.la: $(libprotomod_ip_la_OBJECTS) $(libprotomod_ip_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libprotomod_ip_la_LDFLAGS) $(libprotomod_ip_la_OBJECTS) $(libprotomod_ip_la_LIBADD) $(LIBS) +libprotomod_pfilter.la: $(libprotomod_pfilter_la_OBJECTS) $(libprotomod_pfilter_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libprotomod_pfilter_la_LDFLAGS) $(libprotomod_pfilter_la_OBJECTS) $(libprotomod_pfilter_la_LIBADD) $(LIBS) libprotomod_sessionless.la: $(libprotomod_sessionless_la_OBJECTS) $(libprotomod_sessionless_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libprotomod_sessionless_la_OBJECTS) $(libprotomod_sessionless_la_LIBADD) $(LIBS) + $(LINK) -rpath $(libdir) $(libprotomod_sessionless_la_LDFLAGS) $(libprotomod_sessionless_la_OBJECTS) $(libprotomod_sessionless_la_LIBADD) $(LIBS) libprotomod_sslid.la: $(libprotomod_sslid_la_OBJECTS) $(libprotomod_sslid_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libprotomod_sslid_la_OBJECTS) $(libprotomod_sslid_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(libdir) $(libprotomod_sslid_la_LDFLAGS) $(libprotomod_sslid_la_OBJECTS) $(libprotomod_sslid_la_LIBADD) $(LIBS) libprotomod_url.la: $(libprotomod_url_la_OBJECTS) $(libprotomod_url_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libprotomod_url_la_OBJECTS) $(libprotomod_url_la_LIBADD) $(LIBS) -libprotomod_pfilter.la: $(libprotomod_pfilter_la_OBJECTS) $(libprotomod_pfilter_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libprotomod_pfilter_la_LDFLAGS) $(libprotomod_pfilter_la_OBJECTS) $(libprotomod_pfilter_la_LIBADD) $(LIBS) + $(LINK) -rpath $(libdir) $(libprotomod_url_la_LDFLAGS) $(libprotomod_url_la_OBJECTS) $(libprotomod_url_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -353,53 +311,50 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_http.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_sslid_hash.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_sslid_hash_map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_cinsert.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_cpassive.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_crewrite.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_ip.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_pfilter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_sessionless.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_sslid.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_url.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protomod_pfilter.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -410,13 +365,17 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +distclean-libtool: + -rm -f libtool +uninstall-info-am: + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -428,8 +387,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -439,12 +398,13 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -458,21 +418,22 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -488,7 +449,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install-exec: install-exec-am install-data: install-data-am @@ -522,7 +483,7 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags + distclean-libtool distclean-tags dvi: dvi-am @@ -536,20 +497,12 @@ info-am: install-data-am: -install-dvi: install-dvi-am - install-exec-am: install-libLTLIBRARIES -install-html: install-html-am - install-info: install-info-am install-man: -install-pdf: install-pdf-am - -install-ps: install-ps-am - installcheck-am: maintainer-clean: maintainer-clean-am @@ -570,43 +523,34 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES - -.MAKE: install-am install-strip +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES install: - cp ./.libs/libprotomod_cinsert.so ./.libs/protomod_cinsert.so && \ - cp ./.libs/libprotomod_cpassive.so ./.libs/protomod_cpassive.so && \ - cp ./.libs/libprotomod_crewrite.so ./.libs/protomod_crewrite.so && \ - cp ./.libs/libprotomod_ip.so ./.libs/protomod_ip.so && \ cp ./.libs/libprotomod_sslid.so ./.libs/protomod_sslid.so && \ cp ./.libs/libprotomod_url.so ./.libs/protomod_url.so && \ cp ./.libs/libprotomod_pfilter.so ./.libs/protomod_pfilter.so && \ + cp ./.libs/libprotomod_ip.so ./.libs/protomod_ip.so && \ cp ./.libs/libprotomod_sessionless.so ./.libs/protomod_sessionless.so && \ $(INSTALL) -m 755 -d $(L7VS_MODDIR) $(INSTALL) -m 755 -D \ - ./.libs/protomod_cinsert.so \ - ./.libs/protomod_cpassive.so \ - ./.libs/protomod_crewrite.so \ - ./.libs/protomod_ip.so \ ./.libs/protomod_sslid.so \ ./.libs/protomod_url.so \ ./.libs/protomod_pfilter.so \ + ./.libs/protomod_ip.so \ ./.libs/protomod_sessionless.so $(L7VS_MODDIR) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.11.0