pgpool2.git / summary / log / commit / refs
commit e9bbe227a3fbd92a947f87afd0aace7e0c5c4bec
Author: Bo Peng <pengbo@sraoss.co.jp>
Date: Mon Jan 08 06:13:11 2018 +0000
Improve Makefiles.
Patch provided by Tomoaki Sato.
Makefile.am | 2 +-
Makefile.in | 16 +--
aclocal.m4 | 315 ------------------------------------------
configure | 323 ++------------------------------------------
configure.ac | 2 +-
doc.ja/Makefile.in | 10 +-
doc.ja/src/Makefile.in | 10 +-
doc.ja/src/sgml/Makefile.am | 2 +-
doc.ja/src/sgml/Makefile.in | 12 +-
doc/Makefile.in | 10 +-
doc/src/Makefile.in | 10 +-
doc/src/sgml/Makefile.am | 2 +-
doc/src/sgml/Makefile.in | 12 +-
src/Makefile.in | 294 ++++++++--------------------------------
src/include/Makefile.in | 10 +-
src/libs/Makefile.in | 10 +-
src/libs/pcp/Makefile.am | 17 ++-
src/libs/pcp/Makefile.in | 106 +++++----------
src/parser/Makefile.in | 98 ++++----------
src/tools/Makefile.am | 3 +
src/tools/Makefile.in | 40 +++---
src/tools/pcp/Makefile.in | 61 ++-------
src/tools/pgmd5/Makefile.am | 13 +-
src/tools/pgmd5/Makefile.in | 128 ++++++------------
src/watchdog/Makefile.in | 49 ++-----
25 files changed, 278 insertions(+), 1277 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 45c1a1f07..9088c8223 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = subdir-objects
ACLOCAL_AMFLAGS = -I m4
docs:
- $(MAKE) -C doc doc.ja all
+ $(MAKE) -C doc all && $(MAKE) -C doc.ja all
.PHONY: docs
SUBDIRS = src
diff --git a/Makefile.in b/Makefile.in
index 4839b5779..e49d06d55 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,6 +118,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -218,14 +220,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -302,9 +302,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -366,15 +364,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign --ignore-deps Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -826,7 +824,7 @@ uninstall-am:
docs:
- $(MAKE) -C doc doc.ja all
+ $(MAKE) -C doc all && $(MAKE) -C doc.ja all
.PHONY: docs
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/aclocal.m4 b/aclocal.m4
index c79422ac2..99efdd833 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -141,271 +141,6 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
- [$1], [CXX], [depcc="$CXX" am_compiler_list=],
- [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
- [$1], [UPC], [depcc="$UPC" am_compiler_list=],
- [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- am__universal=false
- m4_case([$1], [CC],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac],
- [CXX],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle '-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
- [--enable-dependency-tracking],
- [do not reject slow dependency extractors])
-AS_HELP_STRING(
- [--disable-dependency-tracking],
- [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Older Autoconf quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
@@ -699,56 +434,6 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
]
)
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 01fb7da5a..32b59ef80 100755
--- a/configure
+++ b/configure
@@ -705,16 +705,6 @@ AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
AM_V
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
am__untar
am__tar
AMTAR
@@ -764,6 +754,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -786,7 +777,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_dependency_tracking
enable_silent_rules
enable_maintainer_mode
enable_shared
@@ -859,6 +849,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1111,6 +1102,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1248,7 +1248,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1401,6 +1401,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1439,10 +1440,6 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-dependency-tracking
- do not reject slow dependency extractors
- --disable-dependency-tracking
- speeds up one-time build
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
--enable-maintainer-mode
@@ -3876,69 +3873,6 @@ else
fi
rmdir .tst 2>/dev/null
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
# Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;
@@ -4050,134 +3984,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-depcc="$CC" am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle '-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
# POSIX will say in a future version that running "rm -f" with no argument
# is OK; and we want to be able to make that assumption in our Makefile
@@ -15206,14 +15012,6 @@ $as_echo_n "checking that generated files are newer than configure... " >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
$as_echo "done" >&6; }
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -15824,7 +15622,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -16111,7 +15908,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"src/include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h" ;;
"src/sql/pgpool_adm/Makefile") CONFIG_FILES="$CONFIG_FILES src/sql/pgpool_adm/Makefile" ;;
@@ -16726,99 +16522,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Older Autoconf quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
- ;;
"libtool":C)
# See if we are running on zsh, and set the options which allow our
diff --git a/configure.ac b/configure.ac
index 95bf087f5..fdfb77780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([pgpool-II], [3.7.0], [pgpool-hackers@pgpool.net], [pgpool-II])
dnl Checks for programs.
AC_PROG_CC
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])
dnl Disallow to rebuild configure.
AM_MAINTAINER_MODE(disable)
diff --git a/doc.ja/Makefile.in b/doc.ja/Makefile.in
index bf50feb75..b4f7f065e 100644
--- a/doc.ja/Makefile.in
+++ b/doc.ja/Makefile.in
@@ -115,6 +115,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -195,7 +197,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -204,7 +205,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -281,9 +281,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -344,9 +342,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc.ja/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc.ja/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc.ja/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps doc.ja/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/doc.ja/src/Makefile.in b/doc.ja/src/Makefile.in
index a48213340..50f7cad9d 100644
--- a/doc.ja/src/Makefile.in
+++ b/doc.ja/src/Makefile.in
@@ -115,6 +115,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -195,7 +197,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -204,7 +205,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -281,9 +281,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -347,9 +345,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc.ja/src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc.ja/src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc.ja/src/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps doc.ja/src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/doc.ja/src/sgml/Makefile.am b/doc.ja/src/sgml/Makefile.am
index 233ee0234..210f85fdd 100644
--- a/doc.ja/src/sgml/Makefile.am
+++ b/doc.ja/src/sgml/Makefile.am
@@ -189,4 +189,4 @@ version.sgml: $(top_srcdir)/configure
check-tabs:
@( ! grep ' ' $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml $(srcdir)/*.dsl $(srcdir)/*.xsl) ) || (echo "Tabs appear in SGML/XML files" 1>&2; exit 1)
-CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/*
+CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/* HTML.index bookindex.sgml man-stamp man1/* man3/* pgpool.xml
diff --git a/doc.ja/src/sgml/Makefile.in b/doc.ja/src/sgml/Makefile.in
index 826cdf9ed..f694be453 100644
--- a/doc.ja/src/sgml/Makefile.in
+++ b/doc.ja/src/sgml/Makefile.in
@@ -117,6 +117,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -137,7 +139,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -146,7 +147,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -223,9 +223,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -293,7 +291,7 @@ JADE.rtf.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl
JADE_html = $(JADE) $(SPFLAGS) -d stylesheet.dsl\#html -t sgml -i html -V website-stylesheet
EXTRA_DIST = $(ALLSGML) html man1 man8 stylesheet.dsl stylesheet.css stylesheet-man.xsl stylesheet-common.xsl
FOP = fop
-CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/*
+CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/* HTML.index bookindex.sgml man-stamp man1/* man3/* pgpool.xml
all: all-am
.SUFFIXES:
@@ -306,9 +304,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc.ja/src/sgml/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc.ja/src/sgml/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc.ja/src/sgml/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps doc.ja/src/sgml/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f1569727c..2a0820719 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -115,6 +115,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -195,7 +197,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -204,7 +205,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -281,9 +281,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -344,9 +342,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/doc/src/Makefile.in b/doc/src/Makefile.in
index 26e04bc43..fefb66f74 100644
--- a/doc/src/Makefile.in
+++ b/doc/src/Makefile.in
@@ -115,6 +115,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -195,7 +197,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -204,7 +205,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -281,9 +281,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -349,9 +347,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc/src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/src/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps doc/src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/doc/src/sgml/Makefile.am b/doc/src/sgml/Makefile.am
index 66c106778..35c383738 100644
--- a/doc/src/sgml/Makefile.am
+++ b/doc/src/sgml/Makefile.am
@@ -187,4 +187,4 @@ version.sgml: $(top_srcdir)/configure
check-tabs:
@( ! grep ' ' $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml $(srcdir)/*.dsl $(srcdir)/*.xsl) ) || (echo "Tabs appear in SGML/XML files" 1>&2; exit 1)
-CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/*
+CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/* HTML.index bookindex.sgml man-stamp man1/* man3/* pgpool.xml
diff --git a/doc/src/sgml/Makefile.in b/doc/src/sgml/Makefile.in
index 16c4066e4..9daf4493b 100644
--- a/doc/src/sgml/Makefile.in
+++ b/doc/src/sgml/Makefile.in
@@ -117,6 +117,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -137,7 +139,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -146,7 +147,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -223,9 +223,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -292,7 +290,7 @@ JADE.rtf.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl
JADE_html = $(JADE) $(SPFLAGS) -d stylesheet.dsl\#html -t sgml -i html -V website-stylesheet
EXTRA_DIST = $(ALLSGML) html man1 man8 stylesheet.dsl stylesheet.css stylesheet-man.xsl stylesheet-common.xsl
FOP = fop
-CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/*
+CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/* HTML.index bookindex.sgml man-stamp man1/* man3/* pgpool.xml
all: all-am
.SUFFIXES:
@@ -305,9 +303,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/src/sgml/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc/src/sgml/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/src/sgml/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps doc/src/sgml/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/Makefile.in b/src/Makefile.in
index 6029cbf10..93b645f13 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -164,9 +164,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -265,9 +264,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/ylwrap \
- config/pool_config.c
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \
+ $(top_srcdir)/ylwrap config/pool_config.c
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -304,7 +302,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -314,7 +311,6 @@ DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\" \
-DHEALTHCHECK_OPTS=$(HEALTHCHECK_DEBUG)
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -391,9 +387,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -589,9 +583,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -661,182 +655,93 @@ clean-binPROGRAMS:
main/$(am__dirstamp):
@$(MKDIR_P) main
@: > main/$(am__dirstamp)
-main/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) main/$(DEPDIR)
- @: > main/$(DEPDIR)/$(am__dirstamp)
-main/main.$(OBJEXT): main/$(am__dirstamp) \
- main/$(DEPDIR)/$(am__dirstamp)
-main/pool_globals.$(OBJEXT): main/$(am__dirstamp) \
- main/$(DEPDIR)/$(am__dirstamp)
-main/pgpool_main.$(OBJEXT): main/$(am__dirstamp) \
- main/$(DEPDIR)/$(am__dirstamp)
-main/health_check.$(OBJEXT): main/$(am__dirstamp) \
- main/$(DEPDIR)/$(am__dirstamp)
+main/main.$(OBJEXT): main/$(am__dirstamp)
+main/pool_globals.$(OBJEXT): main/$(am__dirstamp)
+main/pgpool_main.$(OBJEXT): main/$(am__dirstamp)
+main/health_check.$(OBJEXT): main/$(am__dirstamp)
config/$(am__dirstamp):
@$(MKDIR_P) config
@: > config/$(am__dirstamp)
-config/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) config/$(DEPDIR)
- @: > config/$(DEPDIR)/$(am__dirstamp)
-config/pool_config.$(OBJEXT): config/$(am__dirstamp) \
- config/$(DEPDIR)/$(am__dirstamp)
-config/pool_config_variables.$(OBJEXT): config/$(am__dirstamp) \
- config/$(DEPDIR)/$(am__dirstamp)
+config/pool_config.$(OBJEXT): config/$(am__dirstamp)
+config/pool_config_variables.$(OBJEXT): config/$(am__dirstamp)
pcp_con/$(am__dirstamp):
@$(MKDIR_P) pcp_con
@: > pcp_con/$(am__dirstamp)
-pcp_con/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) pcp_con/$(DEPDIR)
- @: > pcp_con/$(DEPDIR)/$(am__dirstamp)
-pcp_con/pcp_child.$(OBJEXT): pcp_con/$(am__dirstamp) \
- pcp_con/$(DEPDIR)/$(am__dirstamp)
-pcp_con/pcp_worker.$(OBJEXT): pcp_con/$(am__dirstamp) \
- pcp_con/$(DEPDIR)/$(am__dirstamp)
-pcp_con/recovery.$(OBJEXT): pcp_con/$(am__dirstamp) \
- pcp_con/$(DEPDIR)/$(am__dirstamp)
+pcp_con/pcp_child.$(OBJEXT): pcp_con/$(am__dirstamp)
+pcp_con/pcp_worker.$(OBJEXT): pcp_con/$(am__dirstamp)
+pcp_con/recovery.$(OBJEXT): pcp_con/$(am__dirstamp)
auth/$(am__dirstamp):
@$(MKDIR_P) auth
@: > auth/$(am__dirstamp)
-auth/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) auth/$(DEPDIR)
- @: > auth/$(DEPDIR)/$(am__dirstamp)
-auth/md5.$(OBJEXT): auth/$(am__dirstamp) \
- auth/$(DEPDIR)/$(am__dirstamp)
-auth/pool_auth.$(OBJEXT): auth/$(am__dirstamp) \
- auth/$(DEPDIR)/$(am__dirstamp)
-auth/pool_passwd.$(OBJEXT): auth/$(am__dirstamp) \
- auth/$(DEPDIR)/$(am__dirstamp)
-auth/pool_hba.$(OBJEXT): auth/$(am__dirstamp) \
- auth/$(DEPDIR)/$(am__dirstamp)
+auth/md5.$(OBJEXT): auth/$(am__dirstamp)
+auth/pool_auth.$(OBJEXT): auth/$(am__dirstamp)
+auth/pool_passwd.$(OBJEXT): auth/$(am__dirstamp)
+auth/pool_hba.$(OBJEXT): auth/$(am__dirstamp)
protocol/$(am__dirstamp):
@$(MKDIR_P) protocol
@: > protocol/$(am__dirstamp)
-protocol/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) protocol/$(DEPDIR)
- @: > protocol/$(DEPDIR)/$(am__dirstamp)
-protocol/pool_proto2.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
-protocol/child.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
-protocol/pool_process_query.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
-protocol/pool_connection_pool.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
-protocol/pool_proto_modules.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
+protocol/pool_proto2.$(OBJEXT): protocol/$(am__dirstamp)
+protocol/child.$(OBJEXT): protocol/$(am__dirstamp)
+protocol/pool_process_query.$(OBJEXT): protocol/$(am__dirstamp)
+protocol/pool_connection_pool.$(OBJEXT): protocol/$(am__dirstamp)
+protocol/pool_proto_modules.$(OBJEXT): protocol/$(am__dirstamp)
query_cache/$(am__dirstamp):
@$(MKDIR_P) query_cache
@: > query_cache/$(am__dirstamp)
-query_cache/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) query_cache/$(DEPDIR)
- @: > query_cache/$(DEPDIR)/$(am__dirstamp)
-query_cache/pool_memqcache.$(OBJEXT): query_cache/$(am__dirstamp) \
- query_cache/$(DEPDIR)/$(am__dirstamp)
-protocol/CommandComplete.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
+query_cache/pool_memqcache.$(OBJEXT): query_cache/$(am__dirstamp)
+protocol/CommandComplete.$(OBJEXT): protocol/$(am__dirstamp)
context/$(am__dirstamp):
@$(MKDIR_P) context
@: > context/$(am__dirstamp)
-context/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) context/$(DEPDIR)
- @: > context/$(DEPDIR)/$(am__dirstamp)
-context/pool_session_context.$(OBJEXT): context/$(am__dirstamp) \
- context/$(DEPDIR)/$(am__dirstamp)
-context/pool_process_context.$(OBJEXT): context/$(am__dirstamp) \
- context/$(DEPDIR)/$(am__dirstamp)
-context/pool_query_context.$(OBJEXT): context/$(am__dirstamp) \
- context/$(DEPDIR)/$(am__dirstamp)
+context/pool_session_context.$(OBJEXT): context/$(am__dirstamp)
+context/pool_process_context.$(OBJEXT): context/$(am__dirstamp)
+context/pool_query_context.$(OBJEXT): context/$(am__dirstamp)
streaming_replication/$(am__dirstamp):
@$(MKDIR_P) streaming_replication
@: > streaming_replication/$(am__dirstamp)
-streaming_replication/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) streaming_replication/$(DEPDIR)
- @: > streaming_replication/$(DEPDIR)/$(am__dirstamp)
streaming_replication/pool_worker_child.$(OBJEXT): \
- streaming_replication/$(am__dirstamp) \
- streaming_replication/$(DEPDIR)/$(am__dirstamp)
+ streaming_replication/$(am__dirstamp)
rewrite/$(am__dirstamp):
@$(MKDIR_P) rewrite
@: > rewrite/$(am__dirstamp)
-rewrite/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) rewrite/$(DEPDIR)
- @: > rewrite/$(DEPDIR)/$(am__dirstamp)
-rewrite/pool_timestamp.$(OBJEXT): rewrite/$(am__dirstamp) \
- rewrite/$(DEPDIR)/$(am__dirstamp)
-rewrite/pool_lobj.$(OBJEXT): rewrite/$(am__dirstamp) \
- rewrite/$(DEPDIR)/$(am__dirstamp)
+rewrite/pool_timestamp.$(OBJEXT): rewrite/$(am__dirstamp)
+rewrite/pool_lobj.$(OBJEXT): rewrite/$(am__dirstamp)
utils/$(am__dirstamp):
@$(MKDIR_P) utils
@: > utils/$(am__dirstamp)
-utils/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) utils/$(DEPDIR)
- @: > utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_select_walker.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/strlcpy.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/psprintf.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_params.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/ps_status.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_shmem.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_sema.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_signal.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_path.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_ip.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_relcache.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_process_reporting.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_ssl.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/pool_stream.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/getopt_long.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
+utils/pool_select_walker.$(OBJEXT): utils/$(am__dirstamp)
+utils/strlcpy.$(OBJEXT): utils/$(am__dirstamp)
+utils/psprintf.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_params.$(OBJEXT): utils/$(am__dirstamp)
+utils/ps_status.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_shmem.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_sema.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_signal.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_path.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_ip.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_relcache.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_process_reporting.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_ssl.$(OBJEXT): utils/$(am__dirstamp)
+utils/pool_stream.$(OBJEXT): utils/$(am__dirstamp)
+utils/getopt_long.$(OBJEXT): utils/$(am__dirstamp)
utils/mmgr/$(am__dirstamp):
@$(MKDIR_P) utils/mmgr
@: > utils/mmgr/$(am__dirstamp)
-utils/mmgr/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) utils/mmgr/$(DEPDIR)
- @: > utils/mmgr/$(DEPDIR)/$(am__dirstamp)
-utils/mmgr/mcxt.$(OBJEXT): utils/mmgr/$(am__dirstamp) \
- utils/mmgr/$(DEPDIR)/$(am__dirstamp)
-utils/mmgr/aset.$(OBJEXT): utils/mmgr/$(am__dirstamp) \
- utils/mmgr/$(DEPDIR)/$(am__dirstamp)
+utils/mmgr/mcxt.$(OBJEXT): utils/mmgr/$(am__dirstamp)
+utils/mmgr/aset.$(OBJEXT): utils/mmgr/$(am__dirstamp)
utils/error/$(am__dirstamp):
@$(MKDIR_P) utils/error
@: > utils/error/$(am__dirstamp)
-utils/error/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) utils/error/$(DEPDIR)
- @: > utils/error/$(DEPDIR)/$(am__dirstamp)
-utils/error/elog.$(OBJEXT): utils/error/$(am__dirstamp) \
- utils/error/$(DEPDIR)/$(am__dirstamp)
-utils/error/assert.$(OBJEXT): utils/error/$(am__dirstamp) \
- utils/error/$(DEPDIR)/$(am__dirstamp)
+utils/error/elog.$(OBJEXT): utils/error/$(am__dirstamp)
+utils/error/assert.$(OBJEXT): utils/error/$(am__dirstamp)
utils/pcp/$(am__dirstamp):
@$(MKDIR_P) utils/pcp
@: > utils/pcp/$(am__dirstamp)
-utils/pcp/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) utils/pcp/$(DEPDIR)
- @: > utils/pcp/$(DEPDIR)/$(am__dirstamp)
-utils/pcp/pcp_stream.$(OBJEXT): utils/pcp/$(am__dirstamp) \
- utils/pcp/$(DEPDIR)/$(am__dirstamp)
-utils/regex_array.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/json_writer.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/json.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
-utils/statistics.$(OBJEXT): utils/$(am__dirstamp) \
- utils/$(DEPDIR)/$(am__dirstamp)
+utils/pcp/pcp_stream.$(OBJEXT): utils/pcp/$(am__dirstamp)
+utils/regex_array.$(OBJEXT): utils/$(am__dirstamp)
+utils/json_writer.$(OBJEXT): utils/$(am__dirstamp)
+utils/json.$(OBJEXT): utils/$(am__dirstamp)
+utils/statistics.$(OBJEXT): utils/$(am__dirstamp)
pgpool$(EXEEXT): $(pgpool_OBJECTS) $(pgpool_DEPENDENCIES) $(EXTRA_pgpool_DEPENDENCIES)
@rm -f pgpool$(EXEEXT)
@@ -861,80 +766,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@auth/$(DEPDIR)/md5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@auth/$(DEPDIR)/pool_auth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@auth/$(DEPDIR)/pool_hba.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@auth/$(DEPDIR)/pool_passwd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/pool_config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/pool_config_variables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@context/$(DEPDIR)/pool_process_context.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@context/$(DEPDIR)/pool_query_context.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@context/$(DEPDIR)/pool_session_context.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/health_check.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/pgpool_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/pool_globals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pcp_con/$(DEPDIR)/pcp_child.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pcp_con/$(DEPDIR)/pcp_worker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pcp_con/$(DEPDIR)/recovery.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@protocol/$(DEPDIR)/CommandComplete.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@protocol/$(DEPDIR)/child.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@protocol/$(DEPDIR)/pool_connection_pool.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@protocol/$(DEPDIR)/pool_process_query.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@protocol/$(DEPDIR)/pool_proto2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@protocol/$(DEPDIR)/pool_proto_modules.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@query_cache/$(DEPDIR)/pool_memqcache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@rewrite/$(DEPDIR)/pool_lobj.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@rewrite/$(DEPDIR)/pool_timestamp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@streaming_replication/$(DEPDIR)/pool_worker_child.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/getopt_long.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/json.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/json_writer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_ip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_params.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_path.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_process_reporting.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_relcache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_select_walker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_sema.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_shmem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_signal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_ssl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/pool_stream.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/ps_status.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/psprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/regex_array.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/statistics.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/$(DEPDIR)/strlcpy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/error/$(DEPDIR)/assert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/error/$(DEPDIR)/elog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/mmgr/$(DEPDIR)/aset.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/mmgr/$(DEPDIR)/mcxt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/pcp/$(DEPDIR)/pcp_stream.Po@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
.l.c:
$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
@@ -1175,31 +1014,18 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f auth/$(DEPDIR)/$(am__dirstamp)
-rm -f auth/$(am__dirstamp)
- -rm -f config/$(DEPDIR)/$(am__dirstamp)
-rm -f config/$(am__dirstamp)
- -rm -f context/$(DEPDIR)/$(am__dirstamp)
-rm -f context/$(am__dirstamp)
- -rm -f main/$(DEPDIR)/$(am__dirstamp)
-rm -f main/$(am__dirstamp)
- -rm -f pcp_con/$(DEPDIR)/$(am__dirstamp)
-rm -f pcp_con/$(am__dirstamp)
- -rm -f protocol/$(DEPDIR)/$(am__dirstamp)
-rm -f protocol/$(am__dirstamp)
- -rm -f query_cache/$(DEPDIR)/$(am__dirstamp)
-rm -f query_cache/$(am__dirstamp)
- -rm -f rewrite/$(DEPDIR)/$(am__dirstamp)
-rm -f rewrite/$(am__dirstamp)
- -rm -f streaming_replication/$(DEPDIR)/$(am__dirstamp)
-rm -f streaming_replication/$(am__dirstamp)
- -rm -f utils/$(DEPDIR)/$(am__dirstamp)
-rm -f utils/$(am__dirstamp)
- -rm -f utils/error/$(DEPDIR)/$(am__dirstamp)
-rm -f utils/error/$(am__dirstamp)
- -rm -f utils/mmgr/$(DEPDIR)/$(am__dirstamp)
-rm -f utils/mmgr/$(am__dirstamp)
- -rm -f utils/pcp/$(DEPDIR)/$(am__dirstamp)
-rm -f utils/pcp/$(am__dirstamp)
maintainer-clean-generic:
@@ -1211,7 +1037,6 @@ clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
- -rm -rf auth/$(DEPDIR) config/$(DEPDIR) context/$(DEPDIR) main/$(DEPDIR) pcp_con/$(DEPDIR) protocol/$(DEPDIR) query_cache/$(DEPDIR) rewrite/$(DEPDIR) streaming_replication/$(DEPDIR) utils/$(DEPDIR) utils/error/$(DEPDIR) utils/mmgr/$(DEPDIR) utils/pcp/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1257,7 +1082,6 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-recursive
- -rm -rf auth/$(DEPDIR) config/$(DEPDIR) context/$(DEPDIR) main/$(DEPDIR) pcp_con/$(DEPDIR) protocol/$(DEPDIR) query_cache/$(DEPDIR) rewrite/$(DEPDIR) streaming_replication/$(DEPDIR) utils/$(DEPDIR) utils/error/$(DEPDIR) utils/mmgr/$(DEPDIR) utils/pcp/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 053cfa9df..1eff8bc35 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -115,6 +115,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -155,7 +157,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -164,7 +165,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -241,9 +241,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -308,9 +306,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/include/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/include/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in
index dba908a33..dd1cd3a36 100644
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -115,6 +115,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -195,14 +197,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -279,9 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -339,9 +337,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/libs/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/libs/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/libs/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/libs/pcp/Makefile.am b/src/libs/pcp/Makefile.am
index a85b498ed..ccd9115bb 100644
--- a/src/libs/pcp/Makefile.am
+++ b/src/libs/pcp/Makefile.am
@@ -2,14 +2,14 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
lib_LTLIBRARIES = libpcp.la
libpcp_la_LDFLAGS = -version-info 1:0:0
-libpcp_la_SOURCES = pcp.c \
- pcp_stream.c \
- md5.c \
- json.c \
+dist_libpcp_la_SOURCES = pcp.c \
../../utils/pool_path.c \
../../tools/fe_port.c \
../../tools/fe_memutils.c \
- ../../utils/strlcpy.c
+ ../../utils/strlcpy.c
+nodist_libpcp_la_SOURCES = pcp_stream.c \
+ md5.c \
+ json.c
include_HEADERS = ../../../src/include/pcp/pcp.h \
../../../src/include/pcp/libpcp_ext.h \
@@ -18,11 +18,10 @@ include_HEADERS = ../../../src/include/pcp/pcp.h \
md5.c: ../../../src/auth/md5.c
rm -f $@ && ln -s $< .
-md5.h: ../../../src/include/auth/md5.h
- rm -f $@ && ln -s $< .
pcp_stream.c: ../../../src/utils/pcp/pcp_stream.c
rm -f $@ && ln -s $< .
-strlcpy.c: ../../../src/utils/strlcpy.c
- rm -f $@ && ln -s $< .
json.c: ../../../src/utils/json.c
rm -f $@ && ln -s $< .
+
+clean-local:
+ -rm -f $(nodist_libpcp_la_SOURCES)
diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
index 94e75fd56..3776dd94f 100644
--- a/src/libs/pcp/Makefile.in
+++ b/src/libs/pcp/Makefile.in
@@ -137,10 +137,12 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libpcp_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
-am_libpcp_la_OBJECTS = pcp.lo pcp_stream.lo md5.lo json.lo \
- ../../utils/pool_path.lo ../../tools/fe_port.lo \
- ../../tools/fe_memutils.lo ../../utils/strlcpy.lo
-libpcp_la_OBJECTS = $(am_libpcp_la_OBJECTS)
+dist_libpcp_la_OBJECTS = pcp.lo ../../utils/pool_path.lo \
+ ../../tools/fe_port.lo ../../tools/fe_memutils.lo \
+ ../../utils/strlcpy.lo
+nodist_libpcp_la_OBJECTS = pcp_stream.lo md5.lo json.lo
+libpcp_la_OBJECTS = $(dist_libpcp_la_OBJECTS) \
+ $(nodist_libpcp_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -161,9 +163,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -182,8 +183,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(libpcp_la_SOURCES)
-DIST_SOURCES = $(libpcp_la_SOURCES)
+SOURCES = $(dist_libpcp_la_SOURCES) $(nodist_libpcp_la_SOURCES)
+DIST_SOURCES = $(dist_libpcp_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -209,8 +210,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -222,14 +222,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -306,9 +304,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -356,14 +352,15 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
lib_LTLIBRARIES = libpcp.la
libpcp_la_LDFLAGS = -version-info 1:0:0
-libpcp_la_SOURCES = pcp.c \
- pcp_stream.c \
- md5.c \
- json.c \
+dist_libpcp_la_SOURCES = pcp.c \
../../utils/pool_path.c \
../../tools/fe_port.c \
../../tools/fe_memutils.c \
- ../../utils/strlcpy.c
+ ../../utils/strlcpy.c
+
+nodist_libpcp_la_SOURCES = pcp_stream.c \
+ md5.c \
+ json.c
include_HEADERS = ../../../src/include/pcp/pcp.h \
../../../src/include/pcp/libpcp_ext.h \
@@ -383,9 +380,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libs/pcp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/libs/pcp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/libs/pcp/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/libs/pcp/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -441,23 +438,13 @@ clean-libLTLIBRARIES:
../../utils/$(am__dirstamp):
@$(MKDIR_P) ../../utils
@: > ../../utils/$(am__dirstamp)
-../../utils/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) ../../utils/$(DEPDIR)
- @: > ../../utils/$(DEPDIR)/$(am__dirstamp)
-../../utils/pool_path.lo: ../../utils/$(am__dirstamp) \
- ../../utils/$(DEPDIR)/$(am__dirstamp)
+../../utils/pool_path.lo: ../../utils/$(am__dirstamp)
../../tools/$(am__dirstamp):
@$(MKDIR_P) ../../tools
@: > ../../tools/$(am__dirstamp)
-../../tools/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) ../../tools/$(DEPDIR)
- @: > ../../tools/$(DEPDIR)/$(am__dirstamp)
-../../tools/fe_port.lo: ../../tools/$(am__dirstamp) \
- ../../tools/$(DEPDIR)/$(am__dirstamp)
-../../tools/fe_memutils.lo: ../../tools/$(am__dirstamp) \
- ../../tools/$(DEPDIR)/$(am__dirstamp)
-../../utils/strlcpy.lo: ../../utils/$(am__dirstamp) \
- ../../utils/$(DEPDIR)/$(am__dirstamp)
+../../tools/fe_port.lo: ../../tools/$(am__dirstamp)
+../../tools/fe_memutils.lo: ../../tools/$(am__dirstamp)
+../../utils/strlcpy.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)
@@ -472,38 +459,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@../../tools/$(DEPDIR)/fe_memutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@../../tools/$(DEPDIR)/fe_port.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@../../utils/$(DEPDIR)/pool_path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@../../utils/$(DEPDIR)/strlcpy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp_stream.Plo@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -649,9 +612,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f ../../tools/$(DEPDIR)/$(am__dirstamp)
-rm -f ../../tools/$(am__dirstamp)
- -rm -f ../../utils/$(DEPDIR)/$(am__dirstamp)
-rm -f ../../utils/$(am__dirstamp)
maintainer-clean-generic:
@@ -659,11 +620,10 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
mostlyclean-am
distclean: distclean-am
- -rm -rf ../../tools/$(DEPDIR) ../../utils/$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -709,7 +669,6 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ../../tools/$(DEPDIR) ../../utils/$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -731,8 +690,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
+ clean-libLTLIBRARIES clean-libtool clean-local cscopelist-am \
+ ctags ctags-am 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 \
@@ -751,15 +710,14 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
md5.c: ../../../src/auth/md5.c
rm -f $@ && ln -s $< .
-md5.h: ../../../src/include/auth/md5.h
- rm -f $@ && ln -s $< .
pcp_stream.c: ../../../src/utils/pcp/pcp_stream.c
rm -f $@ && ln -s $< .
-strlcpy.c: ../../../src/utils/strlcpy.c
- rm -f $@ && ln -s $< .
json.c: ../../../src/utils/json.c
rm -f $@ && ln -s $< .
+clean-local:
+ -rm -f $(nodist_libpcp_la_SOURCES)
+
# 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.
.NOEXPORT:
diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index 1b37c041a..097f0cd2d 100644
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,9 +90,6 @@ build_triplet = @build@
host_triplet = @host@
@use_repl_snprintf_TRUE@am__append_1 = snprintf.c
subdir = src/parser
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/mkinstalldirs gram.h gram.c \
- $(top_srcdir)/depcomp $(top_srcdir)/ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -93,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/config.h
CONFIG_CLEAN_FILES =
@@ -135,9 +143,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -197,6 +204,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \
+ $(top_srcdir)/ylwrap gram.c gram.h
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -208,14 +217,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -292,9 +299,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -330,6 +335,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -363,10 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/parser/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/parser/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/parser/Makefile
-.PRECIOUS: Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/parser/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -393,24 +398,15 @@ gram.h: gram.c
$(top_srcdir)/src/utils/mmgr/$(am__dirstamp):
@$(MKDIR_P) $(top_srcdir)/src/utils/mmgr
@: > $(top_srcdir)/src/utils/mmgr/$(am__dirstamp)
-$(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) $(top_srcdir)/src/utils/mmgr/$(DEPDIR)
- @: > $(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(am__dirstamp)
$(top_srcdir)/src/utils/mmgr/mcxt.$(OBJEXT): \
- $(top_srcdir)/src/utils/mmgr/$(am__dirstamp) \
- $(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(am__dirstamp)
+ $(top_srcdir)/src/utils/mmgr/$(am__dirstamp)
$(top_srcdir)/src/utils/mmgr/aset.$(OBJEXT): \
- $(top_srcdir)/src/utils/mmgr/$(am__dirstamp) \
- $(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(am__dirstamp)
+ $(top_srcdir)/src/utils/mmgr/$(am__dirstamp)
$(top_srcdir)/src/utils/error/$(am__dirstamp):
@$(MKDIR_P) $(top_srcdir)/src/utils/error
@: > $(top_srcdir)/src/utils/error/$(am__dirstamp)
-$(top_srcdir)/src/utils/error/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) $(top_srcdir)/src/utils/error/$(DEPDIR)
- @: > $(top_srcdir)/src/utils/error/$(DEPDIR)/$(am__dirstamp)
$(top_srcdir)/src/utils/error/elog.$(OBJEXT): \
- $(top_srcdir)/src/utils/error/$(am__dirstamp) \
- $(top_srcdir)/src/utils/error/$(DEPDIR)/$(am__dirstamp)
+ $(top_srcdir)/src/utils/error/$(am__dirstamp)
libsql-parser.a: $(libsql_parser_a_OBJECTS) $(libsql_parser_a_DEPENDENCIES) $(EXTRA_libsql_parser_a_DEPENDENCIES)
$(AM_V_at)-rm -f libsql-parser.a
@@ -425,48 +421,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@$(top_srcdir)/src/utils/error/$(DEPDIR)/elog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(top_srcdir)/src/utils/mmgr/$(DEPDIR)/aset.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(top_srcdir)/src/utils/mmgr/$(DEPDIR)/mcxt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copyfuncs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gram.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keywords.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makefuncs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nodes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outfuncs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool_string.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scan.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scansup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/value.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wchar.Po@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
.y.c:
$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
@@ -589,9 +551,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(top_srcdir)/src/utils/error/$(DEPDIR)/$(am__dirstamp)" || rm -f $(top_srcdir)/src/utils/error/$(DEPDIR)/$(am__dirstamp)
-test -z "$(top_srcdir)/src/utils/error/$(am__dirstamp)" || rm -f $(top_srcdir)/src/utils/error/$(am__dirstamp)
- -test -z "$(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(am__dirstamp)" || rm -f $(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(am__dirstamp)
-test -z "$(top_srcdir)/src/utils/mmgr/$(am__dirstamp)" || rm -f $(top_srcdir)/src/utils/mmgr/$(am__dirstamp)
maintainer-clean-generic:
@@ -605,7 +565,6 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -rf $(top_srcdir)/src/utils/error/$(DEPDIR) $(top_srcdir)/src/utils/mmgr/$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -651,7 +610,6 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf $(top_srcdir)/src/utils/error/$(DEPDIR) $(top_srcdir)/src/utils/mmgr/$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -686,6 +644,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
gram.c: gram.y scan.c
scan.c: scan.l
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 18964f025..cb31c42f7 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -7,3 +7,6 @@ pgpool_setup:
watchdog_setup:
ln -s ../test/watchdog_setup .
+
+clean-local:
+ -rm -f $(dist_bin_SCRIPTS)
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index 9b8a31fca..bebf92ecb 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -146,6 +146,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
+depcomp =
+am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -226,14 +228,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -310,9 +310,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -371,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/tools/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/tools/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/tools/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -627,7 +625,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -694,18 +692,19 @@ uninstall-am: uninstall-dist_binSCRIPTS
.MAKE: $(am__recursive_targets) install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-am clean clean-generic clean-libtool cscopelist-am ctags \
- ctags-am distclean 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-dist_binSCRIPTS install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-dist_binSCRIPTS
+ check-am clean clean-generic clean-libtool clean-local \
+ cscopelist-am ctags ctags-am distclean 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-dist_binSCRIPTS install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-dist_binSCRIPTS
.PRECIOUS: Makefile
@@ -716,6 +715,9 @@ pgpool_setup:
watchdog_setup:
ln -s ../test/watchdog_setup .
+clean-local:
+ -rm -f $(dist_bin_SCRIPTS)
+
# 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.
.NOEXPORT:
diff --git a/src/tools/pcp/Makefile.in b/src/tools/pcp/Makefile.in
index fb86341ce..9dca9fafb 100644
--- a/src/tools/pcp/Makefile.in
+++ b/src/tools/pcp/Makefile.in
@@ -165,9 +165,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -222,8 +221,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -235,14 +233,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -319,9 +315,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -404,9 +398,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/pcp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/tools/pcp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/tools/pcp/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/tools/pcp/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -476,21 +470,12 @@ clean-binPROGRAMS:
../$(am__dirstamp):
@$(MKDIR_P) ..
@: > ../$(am__dirstamp)
-../$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) ../$(DEPDIR)
- @: > ../$(DEPDIR)/$(am__dirstamp)
-../fe_memutils.$(OBJEXT): ../$(am__dirstamp) \
- ../$(DEPDIR)/$(am__dirstamp)
+../fe_memutils.$(OBJEXT): ../$(am__dirstamp)
../../utils/$(am__dirstamp):
@$(MKDIR_P) ../../utils
@: > ../../utils/$(am__dirstamp)
-../../utils/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) ../../utils/$(DEPDIR)
- @: > ../../utils/$(DEPDIR)/$(am__dirstamp)
-../../utils/sprompt.$(OBJEXT): ../../utils/$(am__dirstamp) \
- ../../utils/$(DEPDIR)/$(am__dirstamp)
-../../utils/pool_path.$(OBJEXT): ../../utils/$(am__dirstamp) \
- ../../utils/$(DEPDIR)/$(am__dirstamp)
+../../utils/sprompt.$(OBJEXT): ../../utils/$(am__dirstamp)
+../../utils/pool_path.$(OBJEXT): ../../utils/$(am__dirstamp)
pcp_attach_node$(EXEEXT): $(pcp_attach_node_OBJECTS) $(pcp_attach_node_DEPENDENCIES) $(EXTRA_pcp_attach_node_DEPENDENCIES)
@rm -f pcp_attach_node$(EXEEXT)
@@ -544,34 +529,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@../$(DEPDIR)/fe_memutils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@../../utils/$(DEPDIR)/pool_path.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@../../utils/$(DEPDIR)/sprompt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp_frontend_client.Po@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -694,9 +659,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f ../$(DEPDIR)/$(am__dirstamp)
-rm -f ../$(am__dirstamp)
- -rm -f ../../utils/$(DEPDIR)/$(am__dirstamp)
-rm -f ../../utils/$(am__dirstamp)
maintainer-clean-generic:
@@ -707,7 +670,6 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ../$(DEPDIR) ../../utils/$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -753,7 +715,6 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ../$(DEPDIR) ../../utils/$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/tools/pgmd5/Makefile.am b/src/tools/pgmd5/Makefile.am
index 381654120..b9881ab88 100644
--- a/src/tools/pgmd5/Makefile.am
+++ b/src/tools/pgmd5/Makefile.am
@@ -1,15 +1,15 @@
AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
bin_PROGRAMS = pg_md5
-pg_md5_SOURCES = pg_md5.c \
- md5.c \
+dist_pg_md5_SOURCES = pg_md5.c \
+ ../fe_port.c
+nodist_pg_md5_SOURCES = md5.c \
pool_passwd.c \
pool_signal.c \
strlcpy.c \
regex_array.c \
pool_config_variables.c \
- pool_config.l \
- ../fe_port.c \
+ pool_config.c \
fe_memutils.c \
pool_globals.c
@@ -30,9 +30,12 @@ regex_array.c: ../../../src/utils/regex_array.c
rm -f $@ && ln -s $< .
pool_config_variables.c: ../../../src/config/pool_config_variables.c
rm -f $@ && ln -s $< .
-pool_config.l: ../../../src/config/pool_config.l
+pool_config.c: ../../../src/config/pool_config.c
rm -f $@ && ln -s $< .
fe_memutils.c: ../../../src/tools/fe_memutils.c
rm -f $@ && ln -s $< .
pool_globals.c: ../../../src/main/pool_globals.c
rm -f $@ && ln -s $< .
+
+clean-local:
+ -rm -f $(nodist_pg_md5_SOURCES)
diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in
index cf5a7a07b..7b0363b9e 100644
--- a/src/tools/pgmd5/Makefile.in
+++ b/src/tools/pgmd5/Makefile.in
@@ -108,12 +108,12 @@ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
-am_pg_md5_OBJECTS = pg_md5.$(OBJEXT) md5.$(OBJEXT) \
- pool_passwd.$(OBJEXT) pool_signal.$(OBJEXT) strlcpy.$(OBJEXT) \
- regex_array.$(OBJEXT) pool_config_variables.$(OBJEXT) \
- pool_config.$(OBJEXT) ../fe_port.$(OBJEXT) \
+dist_pg_md5_OBJECTS = pg_md5.$(OBJEXT) ../fe_port.$(OBJEXT)
+nodist_pg_md5_OBJECTS = md5.$(OBJEXT) pool_passwd.$(OBJEXT) \
+ pool_signal.$(OBJEXT) strlcpy.$(OBJEXT) regex_array.$(OBJEXT) \
+ pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \
fe_memutils.$(OBJEXT) pool_globals.$(OBJEXT)
-pg_md5_OBJECTS = $(am_pg_md5_OBJECTS)
+pg_md5_OBJECTS = $(dist_pg_md5_OBJECTS) $(nodist_pg_md5_OBJECTS)
pg_md5_LDADD = $(LDADD)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -132,9 +132,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -153,17 +152,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
-LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
-AM_V_LEX = $(am__v_LEX_@AM_V@)
-am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
-am__v_LEX_0 = @echo " LEX " $@;
-am__v_LEX_1 =
-YLWRAP = $(top_srcdir)/ylwrap
-SOURCES = $(pg_md5_SOURCES)
-DIST_SOURCES = $(pg_md5_SOURCES)
+SOURCES = $(dist_pg_md5_SOURCES) $(nodist_pg_md5_SOURCES)
+DIST_SOURCES = $(dist_pg_md5_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -188,8 +178,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/ylwrap pool_config.c
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -201,7 +190,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
@@ -210,7 +198,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\" -DPOOL_TOOLS
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -287,9 +274,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -335,22 +320,23 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
-pg_md5_SOURCES = pg_md5.c \
- md5.c \
+dist_pg_md5_SOURCES = pg_md5.c \
+ ../fe_port.c
+
+nodist_pg_md5_SOURCES = md5.c \
pool_passwd.c \
pool_signal.c \
strlcpy.c \
regex_array.c \
pool_config_variables.c \
- pool_config.l \
- ../fe_port.c \
+ pool_config.c \
fe_memutils.c \
pool_globals.c
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .l .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -360,9 +346,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/pgmd5/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/tools/pgmd5/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/tools/pgmd5/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/tools/pgmd5/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -432,10 +418,7 @@ clean-binPROGRAMS:
../$(am__dirstamp):
@$(MKDIR_P) ..
@: > ../$(am__dirstamp)
-../$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) ../$(DEPDIR)
- @: > ../$(DEPDIR)/$(am__dirstamp)
-../fe_port.$(OBJEXT): ../$(am__dirstamp) ../$(DEPDIR)/$(am__dirstamp)
+../fe_port.$(OBJEXT): ../$(am__dirstamp)
pg_md5$(EXEEXT): $(pg_md5_OBJECTS) $(pg_md5_DEPENDENCIES) $(EXTRA_pg_md5_DEPENDENCIES)
@rm -f pg_md5$(EXEEXT)
@@ -448,44 +431,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@../$(DEPDIR)/fe_port.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe_memutils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pg_md5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool_config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool_config_variables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool_globals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool_passwd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool_signal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_array.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Po@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-.l.c:
- $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+ $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -608,19 +561,17 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f ../$(DEPDIR)/$(am__dirstamp)
-rm -f ../$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -rm -f pool_config.c
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ mostlyclean-am
distclean: distclean-am
- -rm -rf ../$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -666,7 +617,6 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ../$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -688,18 +638,19 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- 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-man install-pdf \
- install-pdf-am install-ps install-ps-am 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 tags-am uninstall uninstall-am uninstall-binPROGRAMS
+ clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS 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-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ 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 tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS
.PRECIOUS: Makefile
@@ -718,13 +669,16 @@ regex_array.c: ../../../src/utils/regex_array.c
rm -f $@ && ln -s $< .
pool_config_variables.c: ../../../src/config/pool_config_variables.c
rm -f $@ && ln -s $< .
-pool_config.l: ../../../src/config/pool_config.l
+pool_config.c: ../../../src/config/pool_config.c
rm -f $@ && ln -s $< .
fe_memutils.c: ../../../src/tools/fe_memutils.c
rm -f $@ && ln -s $< .
pool_globals.c: ../../../src/main/pool_globals.c
rm -f $@ && ln -s $< .
+clean-local:
+ -rm -f $(nodist_pg_md5_SOURCES)
+
# 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.
.NOEXPORT:
diff --git a/src/watchdog/Makefile.in b/src/watchdog/Makefile.in
index 3d3fc5fa4..e8ba02734 100644
--- a/src/watchdog/Makefile.in
+++ b/src/watchdog/Makefile.in
@@ -131,9 +131,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -182,8 +181,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -195,14 +193,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOG = @CATALOG@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
COLLATEINDEX = @COLLATEINDEX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
-DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
DSYMUTIL = @DSYMUTIL@
@@ -279,9 +275,7 @@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -352,9 +346,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/watchdog/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/watchdog/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/watchdog/Makefile
+ $(AUTOMAKE) --foreign --ignore-deps src/watchdog/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -387,39 +381,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watchdog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_escalation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_heartbeat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_if.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_json_data.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_lifecheck.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_ping.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_utils.Po@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -549,7 +518,6 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -595,7 +563,6 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
[parent: 028d261c59b8]