Imported Upstream version 5.1.0

1 files changed, 49 insertions, 4 deletions

diff --git a/Makefile.in b/Makefile.in
index 61541b2e4..7792802e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,7 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 	$(top_srcdir)/m4/macros/with.m4 \
 	$(top_srcdir)/m4/macros/enable-disable.m4 \
 	$(top_srcdir)/m4/macros/add-plugin.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -77,6 +77,12 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = src/dumm/ext/extconf.rb
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -171,6 +177,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -183,6 +190,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHECK_CFLAGS = @CHECK_CFLAGS@
 CHECK_LIBS = @CHECK_LIBS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -198,6 +207,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GPERF = @GPERF@
 GPRBUILD = @GPRBUILD@
 GREP = @GREP@
@@ -206,6 +216,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -252,6 +263,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKLIB = @SOCKLIB@
 STRIP = @STRIP@
+UNWINDLIB = @UNWINDLIB@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -280,6 +292,7 @@ charon_natt_port = @charon_natt_port@
 charon_plugins = @charon_plugins@
 charon_udp_port = @charon_udp_port@
 clearsilver_LIBS = @clearsilver_LIBS@
+cmd_plugins = @cmd_plugins@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dbusservicedir = @dbusservicedir@
@@ -358,6 +371,7 @@ urandom_device = @urandom_device@
 xml_CFLAGS = @xml_CFLAGS@
 xml_LIBS = @xml_LIBS@
 SUBDIRS = src man init testing $(am__append_1)
+@USE_SILENT_RULES_TRUE@AM_MAKEFLAGS = -s
 ACLOCAL_AMFLAGS = -I m4/config
 EXTRA_DIST = Doxyfile.in LICENSE Android.common.mk.in Android.common.mk Android.mk
 CLEANFILES = Doxyfile
@@ -909,12 +923,14 @@ uninstall-am: uninstall-nodist_config_includeHEADERS
 	uninstall-nodist_config_includeHEADERS
 
 
-Android.common.mk :	Android.common.mk.in configure.in
+Android.common.mk :	Android.common.mk.in configure.ac
+		$(AM_V_GEN) \
 		sed \
 		-e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
 		$(srcdir)/$@.in > $@
 
 Doxyfile :	Doxyfile.in
+		$(AM_V_GEN) \
 		sed \
 		-e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
 		-e "s:\@PACKAGE_NAME\@:$(PACKAGE_NAME):" \
@@ -924,8 +940,37 @@ Doxyfile :	Doxyfile.in
 apidoc :	Doxyfile
 		doxygen
 
-clean-local:
-		rm -rf apidoc
+cov-reset-common:
+		@rm -rf $(top_builddir)/coverage
+		@find $(top_builddir)/{src,scripts} -name "*.gcda" -delete
+
+@COVERAGE_TRUE@cov-reset: cov-reset-common
+@COVERAGE_TRUE@		@lcov --zerocounters --directory $(top_builddir)
+
+@COVERAGE_TRUE@cov-report:
+@COVERAGE_TRUE@		@mkdir $(top_builddir)/coverage
+@COVERAGE_TRUE@		lcov -c -o $(top_builddir)/coverage/coverage.info -d $(top_builddir)
+@COVERAGE_TRUE@		lcov -r $(top_builddir)/coverage/coverage.info '*/tests/*' \
+@COVERAGE_TRUE@			 -o $(top_builddir)/coverage/coverage.cleaned.info
+@COVERAGE_TRUE@		genhtml --num-spaces 4 --legend \
+@COVERAGE_TRUE@				-t "$(PACKAGE_STRING)" \
+@COVERAGE_TRUE@				-o $(top_builddir)/coverage/html \
+@COVERAGE_TRUE@				-p `readlink -m $(abs_top_srcdir)`/src \
+@COVERAGE_TRUE@				$(top_builddir)/coverage/coverage.cleaned.info
+@COVERAGE_TRUE@		@echo "Coverage Report at $(top_builddir)/coverage/html" >&2
+
+@COVERAGE_TRUE@coverage:
+@COVERAGE_TRUE@		@$(MAKE) cov-reset
+@COVERAGE_TRUE@		@$(MAKE) check
+@COVERAGE_TRUE@		@$(MAKE) cov-report
+@COVERAGE_FALSE@coverage:
+@COVERAGE_FALSE@		@echo "reconfigure with --enable-coverage"
+
+clean-local: cov-reset-common
+		@find $(top_builddir)/{src,scripts} -name "*.gcno" -delete
+		@rm -rf apidoc
+
+.PHONY: cov-reset-common cov-reset cov-report coverage
 
 # 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.