From fbf29db03a363565213008a7e6a1eea2c13516f4 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Tue, 25 Feb 2020 09:24:51 +0900 Subject: [PATCH] Update Makefile.in files. --- configure | 20 +++++++++---------- src/Makefile.in | 7 +++++-- src/libs/pcp/Makefile.in | 6 ++++-- src/tools/pcp/Makefile.in | 42 +++++++++++++++++++++++++-------------- 4 files changed, 46 insertions(+), 29 deletions(-) diff --git a/configure b/configure index f7af42791..99ea1ce4c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pgpool-II 4.1devel. +# Generated by GNU Autoconf 2.69 for pgpool-II 4.2devel. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pgpool-II' PACKAGE_TARNAME='pgpool-II' -PACKAGE_VERSION='4.1devel' -PACKAGE_STRING='pgpool-II 4.1devel' +PACKAGE_VERSION='4.2devel' +PACKAGE_STRING='pgpool-II 4.2devel' PACKAGE_BUGREPORT='pgpool-hackers@pgpool.net' PACKAGE_URL='' @@ -1352,7 +1352,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pgpool-II 4.1devel to adapt to many kinds of systems. +\`configure' configures pgpool-II 4.2devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1422,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pgpool-II 4.1devel:";; + short | recursive ) echo "Configuration of pgpool-II 4.2devel:";; esac cat <<\_ACEOF @@ -1549,7 +1549,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pgpool-II configure 4.1devel +pgpool-II configure 4.2devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2212,7 +2212,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pgpool-II $as_me 4.1devel, which was +It was created by pgpool-II $as_me 4.2devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3866,7 +3866,7 @@ fi # Define the identity of the package. PACKAGE='pgpool-II' - VERSION='4.1devel' + VERSION='4.2devel' cat >>confdefs.h <<_ACEOF @@ -15801,7 +15801,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pgpool-II $as_me 4.1devel, which was +This file was extended by pgpool-II $as_me 4.2devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15867,7 +15867,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pgpool-II config.status 4.1devel +pgpool-II config.status 4.2devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/src/Makefile.in b/src/Makefile.in index 57f886476..cbaf16c7d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -136,7 +136,8 @@ am_pgpool_OBJECTS = main/main.$(OBJEXT) main/pool_globals.$(OBJEXT) \ utils/json_writer.$(OBJEXT) utils/json.$(OBJEXT) \ utils/scram-common.$(OBJEXT) utils/base64.$(OBJEXT) \ utils/sha2.$(OBJEXT) utils/ssl_utils.$(OBJEXT) \ - utils/statistics.$(OBJEXT) + utils/statistics.$(OBJEXT) \ + utils/pool_health_check_stats.$(OBJEXT) pgpool_OBJECTS = $(am_pgpool_OBJECTS) pgpool_DEPENDENCIES = parser/libsql-parser.a parser/nodes.o \ watchdog/lib-watchdog.a @@ -485,7 +486,8 @@ pgpool_SOURCES = main/main.c \ utils/base64.c \ utils/sha2.c \ utils/ssl_utils.c \ - utils/statistics.c + utils/statistics.c \ + utils/pool_health_check_stats.c sysconf_DATA = sample/pgpool.conf.sample \ sample/pcp.conf.sample \ @@ -765,6 +767,7 @@ utils/base64.$(OBJEXT): utils/$(am__dirstamp) utils/sha2.$(OBJEXT): utils/$(am__dirstamp) utils/ssl_utils.$(OBJEXT): utils/$(am__dirstamp) utils/statistics.$(OBJEXT): utils/$(am__dirstamp) +utils/pool_health_check_stats.$(OBJEXT): utils/$(am__dirstamp) pgpool$(EXEEXT): $(pgpool_OBJECTS) $(pgpool_DEPENDENCIES) $(EXTRA_pgpool_DEPENDENCIES) @rm -f pgpool$(EXEEXT) diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in index 6f4a51466..d956bb1b0 100644 --- a/src/libs/pcp/Makefile.in +++ b/src/libs/pcp/Makefile.in @@ -129,7 +129,7 @@ libpcp_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp dist_libpcp_la_OBJECTS = pcp.lo ../../utils/pool_path.lo \ ../../tools/fe_port.lo ../../tools/fe_memutils.lo \ - ../../utils/strlcpy.lo + ../../utils/strlcpy.lo ../../utils/pool_health_check_stats.lo nodist_libpcp_la_OBJECTS = pcp_stream.lo md5.lo json.lo libpcp_la_OBJECTS = $(dist_libpcp_la_OBJECTS) \ $(nodist_libpcp_la_OBJECTS) @@ -345,7 +345,8 @@ dist_libpcp_la_SOURCES = pcp.c \ ../../utils/pool_path.c \ ../../tools/fe_port.c \ ../../tools/fe_memutils.c \ - ../../utils/strlcpy.c + ../../utils/strlcpy.c \ + ../../utils/pool_health_check_stats.c nodist_libpcp_la_SOURCES = pcp_stream.c \ md5.c \ @@ -435,6 +436,7 @@ clean-libLTLIBRARIES: ../../tools/fe_port.lo: ../../tools/$(am__dirstamp) ../../tools/fe_memutils.lo: ../../tools/$(am__dirstamp) ../../utils/strlcpy.lo: ../../utils/$(am__dirstamp) +../../utils/pool_health_check_stats.lo: ../../utils/$(am__dirstamp) libpcp.la: $(libpcp_la_OBJECTS) $(libpcp_la_DEPENDENCIES) $(EXTRA_libpcp_la_DEPENDENCIES) $(AM_V_CCLD)$(libpcp_la_LINK) -rpath $(libdir) $(libpcp_la_OBJECTS) $(libpcp_la_LIBADD) $(LIBS) diff --git a/src/tools/pcp/Makefile.in b/src/tools/pcp/Makefile.in index 04cc2b1ef..3f95cac89 100644 --- a/src/tools/pcp/Makefile.in +++ b/src/tools/pcp/Makefile.in @@ -79,11 +79,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = pcp_stop_pgpool$(EXEEXT) pcp_node_count$(EXEEXT) \ - pcp_node_info$(EXEEXT) pcp_proc_count$(EXEEXT) \ - pcp_proc_info$(EXEEXT) pcp_detach_node$(EXEEXT) \ - pcp_attach_node$(EXEEXT) pcp_recovery_node$(EXEEXT) \ - pcp_promote_node$(EXEEXT) pcp_pool_status$(EXEEXT) \ - pcp_watchdog_info$(EXEEXT) + pcp_node_info$(EXEEXT) pcp_health_check_stats$(EXEEXT) \ + pcp_proc_count$(EXEEXT) pcp_proc_info$(EXEEXT) \ + pcp_detach_node$(EXEEXT) pcp_attach_node$(EXEEXT) \ + pcp_recovery_node$(EXEEXT) pcp_promote_node$(EXEEXT) \ + pcp_pool_status$(EXEEXT) pcp_watchdog_info$(EXEEXT) subdir = src/tools/pcp DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/mkinstalldirs @@ -116,6 +116,10 @@ am__v_lt_1 = am_pcp_detach_node_OBJECTS = $(am__objects_1) pcp_detach_node_OBJECTS = $(am_pcp_detach_node_OBJECTS) pcp_detach_node_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la +am_pcp_health_check_stats_OBJECTS = $(am__objects_1) \ + ../../utils/pool_health_check_stats.$(OBJEXT) +pcp_health_check_stats_OBJECTS = $(am_pcp_health_check_stats_OBJECTS) +pcp_health_check_stats_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la am_pcp_node_count_OBJECTS = $(am__objects_1) pcp_node_count_OBJECTS = $(am_pcp_node_count_OBJECTS) pcp_node_count_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la @@ -177,17 +181,17 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(pcp_attach_node_SOURCES) $(pcp_detach_node_SOURCES) \ - $(pcp_node_count_SOURCES) $(pcp_node_info_SOURCES) \ - $(pcp_pool_status_SOURCES) $(pcp_proc_count_SOURCES) \ - $(pcp_proc_info_SOURCES) $(pcp_promote_node_SOURCES) \ - $(pcp_recovery_node_SOURCES) $(pcp_stop_pgpool_SOURCES) \ - $(pcp_watchdog_info_SOURCES) + $(pcp_health_check_stats_SOURCES) $(pcp_node_count_SOURCES) \ + $(pcp_node_info_SOURCES) $(pcp_pool_status_SOURCES) \ + $(pcp_proc_count_SOURCES) $(pcp_proc_info_SOURCES) \ + $(pcp_promote_node_SOURCES) $(pcp_recovery_node_SOURCES) \ + $(pcp_stop_pgpool_SOURCES) $(pcp_watchdog_info_SOURCES) DIST_SOURCES = $(pcp_attach_node_SOURCES) $(pcp_detach_node_SOURCES) \ - $(pcp_node_count_SOURCES) $(pcp_node_info_SOURCES) \ - $(pcp_pool_status_SOURCES) $(pcp_proc_count_SOURCES) \ - $(pcp_proc_info_SOURCES) $(pcp_promote_node_SOURCES) \ - $(pcp_recovery_node_SOURCES) $(pcp_stop_pgpool_SOURCES) \ - $(pcp_watchdog_info_SOURCES) + $(pcp_health_check_stats_SOURCES) $(pcp_node_count_SOURCES) \ + $(pcp_node_info_SOURCES) $(pcp_pool_status_SOURCES) \ + $(pcp_proc_count_SOURCES) $(pcp_proc_info_SOURCES) \ + $(pcp_promote_node_SOURCES) $(pcp_recovery_node_SOURCES) \ + $(pcp_stop_pgpool_SOURCES) $(pcp_watchdog_info_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -358,6 +362,8 @@ pcp_stop_pgpool_LDADD = $(libs_dir)/pcp/libpcp.la pcp_node_count_SOURCES = $(client_sources) pcp_node_count_LDADD = $(libs_dir)/pcp/libpcp.la pcp_node_info_SOURCES = $(client_sources) +pcp_health_check_stats_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_health_check_stats_SOURCES = $(client_sources) ../../utils/pool_health_check_stats.c pcp_node_info_LDADD = $(libs_dir)/pcp/libpcp.la pcp_proc_count_SOURCES = $(client_sources) pcp_proc_count_LDADD = $(libs_dir)/pcp/libpcp.la @@ -475,6 +481,12 @@ pcp_attach_node$(EXEEXT): $(pcp_attach_node_OBJECTS) $(pcp_attach_node_DEPENDENC pcp_detach_node$(EXEEXT): $(pcp_detach_node_OBJECTS) $(pcp_detach_node_DEPENDENCIES) $(EXTRA_pcp_detach_node_DEPENDENCIES) @rm -f pcp_detach_node$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pcp_detach_node_OBJECTS) $(pcp_detach_node_LDADD) $(LIBS) +../../utils/pool_health_check_stats.$(OBJEXT): \ + ../../utils/$(am__dirstamp) + +pcp_health_check_stats$(EXEEXT): $(pcp_health_check_stats_OBJECTS) $(pcp_health_check_stats_DEPENDENCIES) $(EXTRA_pcp_health_check_stats_DEPENDENCIES) + @rm -f pcp_health_check_stats$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pcp_health_check_stats_OBJECTS) $(pcp_health_check_stats_LDADD) $(LIBS) pcp_node_count$(EXEEXT): $(pcp_node_count_OBJECTS) $(pcp_node_count_DEPENDENCIES) $(EXTRA_pcp_node_count_DEPENDENCIES) @rm -f pcp_node_count$(EXEEXT) -- 2.39.5