pgpool2.git / summary / log / commit / refs
commit f8ca4d262a00ffc240502f135d69515b2ead47fb
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Wed Nov 19 07:46:48 2014 +0000
Mega commit to fix autotools related templates.
Fix tons of warnings from autoconf. Also add "README.build" to suggest
how to stabilize autools generated files.
Makefile.in | 2 +-
README.build | 15 ++++
configure | 44 ++++++-----
doc/Makefile.in | 2 +-
src/Makefile.in | 2 +-
src/include/Makefile.in | 2 +-
src/include/config.h.in | 2 +-
src/libs/Makefile.in | 2 +-
src/libs/pcp/Makefile.am | 32 +++++---
src/libs/pcp/Makefile.in | 85 ++++++++--------------
src/parser/Makefile.in | 105 ++++++++++++---------------
src/tools/Makefile.in | 2 +-
src/tools/pcp/Makefile.in | 73 ++++++++++---------
src/tools/pgmd5/Makefile.am | 39 +++++++---
src/tools/pgmd5/Makefile.in | 173 ++++++++++----------------------------------
src/watchdog/Makefile.in | 17 +++--
16 files changed, 265 insertions(+), 332 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index b71aa3a0f..1b78283d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/README.build b/README.build
new file mode 100644
index 000000000..df495f7ca
--- /dev/null
+++ b/README.build
@@ -0,0 +1,15 @@
+This memo explains the rule how to build pgpool-II source tree using
+autotools.
+
+Since pgpool-II uses autotools to create Makefiles, it is very
+important to fix the tool chain versions. To ensure this, all
+developers who need to use autotools *and* push the changes to the
+source repository *must* use following platform:
+
+Ubuntu 14.04 LTS
+
+This may be changed in the future but for now, please use it as the
+reference platform.
+
+November 19, 2014
+Tatsuo Ishii
diff --git a/configure b/configure
index 7622802a7..70f7ec56d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for pgpool-II 3.4.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -585,12 +585,12 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='pgpool-II'
+PACKAGE_TARNAME='pgpool-ii'
+PACKAGE_VERSION='3.4.0'
+PACKAGE_STRING='pgpool-II 3.4.0'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
# Factoring default headers for most tests.
ac_includes_default="\
@@ -834,7 +834,7 @@ sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1334,7 +1334,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures pgpool-II 3.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1382,7 +1382,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/pgpool-ii]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1403,7 +1403,9 @@ _ACEOF
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of pgpool-II 3.4.0:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -1527,7 +1529,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-configure
+pgpool-II configure 3.4.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2186,7 +2188,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by pgpool-II $as_me 3.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3961,10 +3963,18 @@ fi
# Define the identity of the package.
+ PACKAGE='pgpool-ii'
+ VERSION='3.4.0'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
- PACKAGE=pgpool-II
- VERSION=3.4.0
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
# Some tools Automake needs.
@@ -15066,7 +15076,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by $as_me, which was
+This file was extended by pgpool-II $as_me 3.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15132,7 +15142,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-config.status
+pgpool-II config.status 3.4.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 393000007..a7f99cdcd 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/Makefile.in b/src/Makefile.in
index b363667a5..6020854da 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -91,7 +91,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 834fcb6fa..abb9e29a9 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/include/config.h.in b/src/include/config.h.in
index c2092a20c..fe7fcdfef 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -1,4 +1,4 @@
-/* src/include/config.h.in. Generated from configure.in by autoheader. */
+/* src/include/config.h.in. Generated from configure.ac by autoheader. */
/* Define to the type of arg 1 of 'accept' */
#undef ACCEPT_TYPE_ARG1
diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in
index 539a35dcb..34b433f5c 100644
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/libs/pcp/Makefile.am b/src/libs/pcp/Makefile.am
index 07f5a31ae..b37b27058 100644
--- a/src/libs/pcp/Makefile.am
+++ b/src/libs/pcp/Makefile.am
@@ -1,19 +1,27 @@
AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
lib_LTLIBRARIES = libpcp.la
-libpcp_la_SOURCES = pcp.c $(top_srcdir)/src/utils/pcp/pcp_stream.c \
- $(top_srcdir)/src/utils/pcp/pcp_error.c \
- $(top_srcdir)/src/utils/pcp/pcp_timeout.c \
- $(top_srcdir)/src/auth/md5.c \
- $(top_srcdir)/src/utils/strlcpy.c
+libpcp_la_SOURCES = pcp.c \
+ pcp_stream.c \
+ pcp_error.c \
+ pcp_timeout.c \
+ md5.c \
+ strlcpy.c
-include_HEADERS = $(top_srcdir)/src/include/pcp/pcp.h \
- $(top_srcdir)/src/include/pcp/libpcp_ext.h \
- $(top_srcdir)/src/include/pool_type.h \
- $(top_srcdir)/src/include/utils/pool_process_reporting.h
+include_HEADERS = ../../../src/include/pcp/pcp.h \
+ ../../../src/include/pcp/libpcp_ext.h \
+ ../../../src/include/pool_type.h \
+ ../../../src/include/utils/pool_process_reporting.h
-md5.c: $(top_srcdir)/src/auth/md5.c
+md5.c: ../../../src/auth/md5.c
rm -f $@ && ln -s $< .
-md5.h: $(top_srcdir)/src/include/auth/md5.h
+md5.h: ../../../src/include/auth/md5.h
+ rm -f $@ && ln -s $< .
+pcp_stream.c: ../../../src/utils/pcp/pcp_stream.c
+ rm -f $@ && ln -s $< .
+pcp_error.c: ../../../src/utils/pcp/pcp_error.c
+ rm -f $@ && ln -s $< .
+pcp_timeout.c: ../../../src/utils/pcp/pcp_timeout.c
+ rm -f $@ && ln -s $< .
+strlcpy.c: ../../../src/utils/strlcpy.c
rm -f $@ && ln -s $< .
-
diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
index 8465b368f..7f6d9a863 100644
--- a/src/libs/pcp/Makefile.in
+++ b/src/libs/pcp/Makefile.in
@@ -90,7 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -324,16 +324,17 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
lib_LTLIBRARIES = libpcp.la
-libpcp_la_SOURCES = pcp.c $(top_srcdir)/src/utils/pcp/pcp_stream.c \
- $(top_srcdir)/src/utils/pcp/pcp_error.c \
- $(top_srcdir)/src/utils/pcp/pcp_timeout.c \
- $(top_srcdir)/src/auth/md5.c \
- $(top_srcdir)/src/utils/strlcpy.c
-
-include_HEADERS = $(top_srcdir)/src/include/pcp/pcp.h \
- $(top_srcdir)/src/include/pcp/libpcp_ext.h \
- $(top_srcdir)/src/include/pool_type.h \
- $(top_srcdir)/src/include/utils/pool_process_reporting.h
+libpcp_la_SOURCES = pcp.c \
+ pcp_stream.c \
+ pcp_error.c \
+ pcp_timeout.c \
+ md5.c \
+ strlcpy.c
+
+include_HEADERS = ../../../src/include/pcp/pcp.h \
+ ../../../src/include/pcp/libpcp_ext.h \
+ ../../../src/include/pool_type.h \
+ ../../../src/include/utils/pool_process_reporting.h
all: all-am
@@ -422,61 +423,29 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
-pcp_stream.lo: $(top_srcdir)/src/utils/pcp/pcp_stream.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pcp_stream.lo -MD -MP -MF $(DEPDIR)/pcp_stream.Tpo -c -o pcp_stream.lo `test -f '$(top_srcdir)/src/utils/pcp/pcp_stream.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pcp/pcp_stream.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pcp_stream.Tpo $(DEPDIR)/pcp_stream.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/pcp/pcp_stream.c' object='pcp_stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pcp_stream.lo `test -f '$(top_srcdir)/src/utils/pcp/pcp_stream.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pcp/pcp_stream.c
-
-pcp_error.lo: $(top_srcdir)/src/utils/pcp/pcp_error.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pcp_error.lo -MD -MP -MF $(DEPDIR)/pcp_error.Tpo -c -o pcp_error.lo `test -f '$(top_srcdir)/src/utils/pcp/pcp_error.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pcp/pcp_error.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pcp_error.Tpo $(DEPDIR)/pcp_error.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/pcp/pcp_error.c' object='pcp_error.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pcp_error.lo `test -f '$(top_srcdir)/src/utils/pcp/pcp_error.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pcp/pcp_error.c
-
-pcp_timeout.lo: $(top_srcdir)/src/utils/pcp/pcp_timeout.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pcp_timeout.lo -MD -MP -MF $(DEPDIR)/pcp_timeout.Tpo -c -o pcp_timeout.lo `test -f '$(top_srcdir)/src/utils/pcp/pcp_timeout.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pcp/pcp_timeout.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pcp_timeout.Tpo $(DEPDIR)/pcp_timeout.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/pcp/pcp_timeout.c' object='pcp_timeout.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pcp_timeout.lo `test -f '$(top_srcdir)/src/utils/pcp/pcp_timeout.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pcp/pcp_timeout.c
-
-md5.lo: $(top_srcdir)/src/auth/md5.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.lo -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.lo `test -f '$(top_srcdir)/src/auth/md5.c' || echo '$(srcdir)/'`$(top_srcdir)/src/auth/md5.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/auth/md5.c' object='md5.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.lo `test -f '$(top_srcdir)/src/auth/md5.c' || echo '$(srcdir)/'`$(top_srcdir)/src/auth/md5.c
-
-strlcpy.lo: $(top_srcdir)/src/utils/strlcpy.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.lo -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.lo `test -f '$(top_srcdir)/src/utils/strlcpy.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/strlcpy.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/strlcpy.c' object='strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.lo `test -f '$(top_srcdir)/src/utils/strlcpy.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/strlcpy.c
-
mostlyclean-libtool:
-rm -f *.lo
@@ -713,9 +682,17 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
uninstall-libLTLIBRARIES
-md5.c: $(top_srcdir)/src/auth/md5.c
+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 $< .
+pcp_error.c: ../../../src/utils/pcp/pcp_error.c
+ rm -f $@ && ln -s $< .
+pcp_timeout.c: ../../../src/utils/pcp/pcp_timeout.c
rm -f $@ && ln -s $< .
-md5.h: $(top_srcdir)/src/include/auth/md5.h
+strlcpy.c: ../../../src/utils/strlcpy.c
rm -f $@ && ln -s $< .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index d2832acdc..eb30ba5f5 100644
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -89,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -104,12 +104,15 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libsql_parser_a_AR = $(AR) $(ARFLAGS)
libsql_parser_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
am_libsql_parser_a_OBJECTS = copyfuncs.$(OBJEXT) gram.$(OBJEXT) \
keywords.$(OBJEXT) kwlookup.$(OBJEXT) list.$(OBJEXT) \
makefuncs.$(OBJEXT) nodes.$(OBJEXT) outfuncs.$(OBJEXT) \
parser.$(OBJEXT) pool_string.$(OBJEXT) scansup.$(OBJEXT) \
snprintf.$(OBJEXT) stringinfo.$(OBJEXT) value.$(OBJEXT) \
- mcxt.$(OBJEXT) aset.$(OBJEXT) elog.$(OBJEXT) wchar.$(OBJEXT)
+ $(top_srcdir)/src/utils/mmgr/mcxt.$(OBJEXT) \
+ $(top_srcdir)/src/utils/mmgr/aset.$(OBJEXT) \
+ $(top_srcdir)/src/utils/error/elog.$(OBJEXT) wchar.$(OBJEXT)
libsql_parser_a_OBJECTS = $(am_libsql_parser_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -127,12 +130,12 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
@@ -377,6 +380,27 @@ clean-noinstLIBRARIES:
gram.h: gram.c
@if test ! -f $@; then rm -f gram.c; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) gram.c; else :; fi
+$(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/aset.$(OBJEXT): \
+ $(top_srcdir)/src/utils/mmgr/$(am__dirstamp) \
+ $(top_srcdir)/src/utils/mmgr/$(DEPDIR)/$(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)
libsql-parser.a: $(libsql_parser_a_OBJECTS) $(libsql_parser_a_DEPENDENCIES) $(EXTRA_libsql_parser_a_DEPENDENCIES)
$(AM_V_at)-rm -f libsql-parser.a
@@ -385,19 +409,21 @@ libsql-parser.a: $(libsql_parser_a_OBJECTS) $(libsql_parser_a_DEPENDENCIES) $(EX
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f $(top_srcdir)/src/utils/error/*.$(OBJEXT)
+ -rm -f $(top_srcdir)/src/utils/mmgr/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aset.Po@am__quote@
+@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)/elog.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)/kwlookup.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)/mcxt.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@
@@ -409,68 +435,29 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wchar.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
-mcxt.o: $(top_srcdir)/src/utils/mmgr/mcxt.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mcxt.o -MD -MP -MF $(DEPDIR)/mcxt.Tpo -c -o mcxt.o `test -f '$(top_srcdir)/src/utils/mmgr/mcxt.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/mmgr/mcxt.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mcxt.Tpo $(DEPDIR)/mcxt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/mmgr/mcxt.c' object='mcxt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mcxt.o `test -f '$(top_srcdir)/src/utils/mmgr/mcxt.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/mmgr/mcxt.c
-
-mcxt.obj: $(top_srcdir)/src/utils/mmgr/mcxt.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mcxt.obj -MD -MP -MF $(DEPDIR)/mcxt.Tpo -c -o mcxt.obj `if test -f '$(top_srcdir)/src/utils/mmgr/mcxt.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/mmgr/mcxt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/mmgr/mcxt.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mcxt.Tpo $(DEPDIR)/mcxt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/mmgr/mcxt.c' object='mcxt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mcxt.obj `if test -f '$(top_srcdir)/src/utils/mmgr/mcxt.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/mmgr/mcxt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/mmgr/mcxt.c'; fi`
-
-aset.o: $(top_srcdir)/src/utils/mmgr/aset.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aset.o -MD -MP -MF $(DEPDIR)/aset.Tpo -c -o aset.o `test -f '$(top_srcdir)/src/utils/mmgr/aset.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/mmgr/aset.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aset.Tpo $(DEPDIR)/aset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/mmgr/aset.c' object='aset.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aset.o `test -f '$(top_srcdir)/src/utils/mmgr/aset.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/mmgr/aset.c
-
-aset.obj: $(top_srcdir)/src/utils/mmgr/aset.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aset.obj -MD -MP -MF $(DEPDIR)/aset.Tpo -c -o aset.obj `if test -f '$(top_srcdir)/src/utils/mmgr/aset.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/mmgr/aset.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/mmgr/aset.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aset.Tpo $(DEPDIR)/aset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/mmgr/aset.c' object='aset.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aset.obj `if test -f '$(top_srcdir)/src/utils/mmgr/aset.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/mmgr/aset.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/mmgr/aset.c'; fi`
-
-elog.o: $(top_srcdir)/src/utils/error/elog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT elog.o -MD -MP -MF $(DEPDIR)/elog.Tpo -c -o elog.o `test -f '$(top_srcdir)/src/utils/error/elog.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/error/elog.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/elog.Tpo $(DEPDIR)/elog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/error/elog.c' object='elog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o elog.o `test -f '$(top_srcdir)/src/utils/error/elog.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/error/elog.c
-
-elog.obj: $(top_srcdir)/src/utils/error/elog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT elog.obj -MD -MP -MF $(DEPDIR)/elog.Tpo -c -o elog.obj `if test -f '$(top_srcdir)/src/utils/error/elog.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/error/elog.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/error/elog.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/elog.Tpo $(DEPDIR)/elog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/error/elog.c' object='elog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o elog.obj `if test -f '$(top_srcdir)/src/utils/error/elog.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/error/elog.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/error/elog.c'; fi`
-
.y.c:
$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
@@ -592,6 +579,10 @@ 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:
@echo "This command is intended for maintainers to use"
@@ -604,7 +595,7 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -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
@@ -650,7 +641,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -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
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index cc1ee9573..ab3b6eeaf 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/tools/pcp/Makefile.in b/src/tools/pcp/Makefile.in
index 52c852eff..25f3ba0ce 100644
--- a/src/tools/pcp/Makefile.in
+++ b/src/tools/pcp/Makefile.in
@@ -94,7 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -103,8 +103,9 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
+am__dirstamp = $(am__leading_dot)dirstamp
am_pcp_attach_node_OBJECTS = pcp_attach_node.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_attach_node_OBJECTS = $(am_pcp_attach_node_OBJECTS)
pcp_attach_node_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -112,47 +113,47 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
am_pcp_detach_node_OBJECTS = pcp_detach_node.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_detach_node_OBJECTS = $(am_pcp_detach_node_OBJECTS)
pcp_detach_node_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_node_count_OBJECTS = pcp_node_count.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_node_count_OBJECTS = $(am_pcp_node_count_OBJECTS)
pcp_node_count_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_node_info_OBJECTS = pcp_node_info.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_node_info_OBJECTS = $(am_pcp_node_info_OBJECTS)
pcp_node_info_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_pool_status_OBJECTS = pcp_pool_status.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_pool_status_OBJECTS = $(am_pcp_pool_status_OBJECTS)
pcp_pool_status_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_proc_count_OBJECTS = pcp_proc_count.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_proc_count_OBJECTS = $(am_pcp_proc_count_OBJECTS)
pcp_proc_count_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_proc_info_OBJECTS = pcp_proc_info.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_proc_info_OBJECTS = $(am_pcp_proc_info_OBJECTS)
pcp_proc_info_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_promote_node_OBJECTS = pcp_promote_node.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_promote_node_OBJECTS = $(am_pcp_promote_node_OBJECTS)
pcp_promote_node_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_recovery_node_OBJECTS = pcp_recovery_node.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_recovery_node_OBJECTS = $(am_pcp_recovery_node_OBJECTS)
pcp_recovery_node_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_stop_pgpool_OBJECTS = pcp_stop_pgpool.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_stop_pgpool_OBJECTS = $(am_pcp_stop_pgpool_OBJECTS)
pcp_stop_pgpool_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_systemdb_info_OBJECTS = pcp_systemdb_info.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_systemdb_info_OBJECTS = $(am_pcp_systemdb_info_OBJECTS)
pcp_systemdb_info_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
am_pcp_watchdog_info_OBJECTS = pcp_watchdog_info.$(OBJEXT) \
- fe_memutils.$(OBJEXT)
+ ../fe_memutils.$(OBJEXT)
pcp_watchdog_info_OBJECTS = $(am_pcp_watchdog_info_OBJECTS)
pcp_watchdog_info_DEPENDENCIES = $(libs_dir)/pcp/libpcp.la
AM_V_P = $(am__v_P_@AM_V@)
@@ -461,6 +462,14 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+../$(am__dirstamp):
+ @$(MKDIR_P) ..
+ @: > ../$(am__dirstamp)
+../$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) ../$(DEPDIR)
+ @: > ../$(DEPDIR)/$(am__dirstamp)
+../fe_memutils.$(OBJEXT): ../$(am__dirstamp) \
+ ../$(DEPDIR)/$(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)
@@ -512,11 +521,12 @@ pcp_watchdog_info$(EXEEXT): $(pcp_watchdog_info_OBJECTS) $(pcp_watchdog_info_DEP
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f ../*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe_memutils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../$(DEPDIR)/fe_memutils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp_attach_node.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp_detach_node.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp_node_count.Po@am__quote@
@@ -531,40 +541,29 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcp_watchdog_info.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
-fe_memutils.o: ../fe_memutils.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fe_memutils.o -MD -MP -MF $(DEPDIR)/fe_memutils.Tpo -c -o fe_memutils.o `test -f '../fe_memutils.c' || echo '$(srcdir)/'`../fe_memutils.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fe_memutils.Tpo $(DEPDIR)/fe_memutils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../fe_memutils.c' object='fe_memutils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fe_memutils.o `test -f '../fe_memutils.c' || echo '$(srcdir)/'`../fe_memutils.c
-
-fe_memutils.obj: ../fe_memutils.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fe_memutils.obj -MD -MP -MF $(DEPDIR)/fe_memutils.Tpo -c -o fe_memutils.obj `if test -f '../fe_memutils.c'; then $(CYGPATH_W) '../fe_memutils.c'; else $(CYGPATH_W) '$(srcdir)/../fe_memutils.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fe_memutils.Tpo $(DEPDIR)/fe_memutils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../fe_memutils.c' object='fe_memutils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fe_memutils.obj `if test -f '../fe_memutils.c'; then $(CYGPATH_W) '../fe_memutils.c'; else $(CYGPATH_W) '$(srcdir)/../fe_memutils.c'; fi`
-
mostlyclean-libtool:
-rm -f *.lo
@@ -686,6 +685,8 @@ 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"
@@ -695,7 +696,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -rf ../$(DEPDIR) ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -741,7 +742,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -rf ../$(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 e8e27a0cb..767128f83 100644
--- a/src/tools/pgmd5/Makefile.am
+++ b/src/tools/pgmd5/Makefile.am
@@ -2,15 +2,36 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@
bin_PROGRAMS = pg_md5
pg_md5_SOURCES = pg_md5.c \
- $(top_srcdir)/src/auth/md5.c \
- $(top_srcdir)/src/auth/pool_passwd.c \
- $(top_srcdir)/src/utils/pool_signal.c \
- $(top_srcdir)/src/utils/strlcpy.c \
- $(top_srcdir)/src/utils/regex_array.c \
- $(top_srcdir)/src/config/pool_config.l \
- $(top_srcdir)/src/tools/fe_port.c \
- $(top_srcdir)/src/tools/fe_memutils.c \
- $(top_srcdir)/src/main/pool_globals.c
+ md5.c \
+ pool_passwd.c \
+ pool_signal.c \
+ strlcpy.c \
+ regex_array.c \
+ pool_config.l \
+ fe_port.c \
+ fe_memutils.c \
+ pool_globals.c
DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\" -DPOOL_TOOLS
+
+md5.c: ../../../src/auth/md5.c
+ rm -f $@ && ln -s $< .
+md5.h: ../../../src/include/auth/md5.h
+ rm -f $@ && ln -s $< .
+pool_passwd.c: ../../../src/auth/pool_passwd.c
+ rm -f $@ && ln -s $< .
+pool_signal.c: ../../../src/utils/pool_signal.c
+ rm -f $@ && ln -s $< .
+strlcpy.c: ../../../src/utils/strlcpy.c
+ rm -f $@ && ln -s $< .
+regex_array.c: ../../../src/utils/regex_array.c
+ rm -f $@ && ln -s $< .
+pool_config.l: ../../../src/config/pool_config.l
+ rm -f $@ && ln -s $< .
+fe_port.c: ../../../src/tools/fe_port.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 $< .
diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in
index 0d9e9e78b..459cdd476 100644
--- a/src/tools/pgmd5/Makefile.in
+++ b/src/tools/pgmd5/Makefile.in
@@ -90,7 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -308,15 +308,15 @@ 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 \
- $(top_srcdir)/src/auth/md5.c \
- $(top_srcdir)/src/auth/pool_passwd.c \
- $(top_srcdir)/src/utils/pool_signal.c \
- $(top_srcdir)/src/utils/strlcpy.c \
- $(top_srcdir)/src/utils/regex_array.c \
- $(top_srcdir)/src/config/pool_config.l \
- $(top_srcdir)/src/tools/fe_port.c \
- $(top_srcdir)/src/tools/fe_memutils.c \
- $(top_srcdir)/src/main/pool_globals.c
+ md5.c \
+ pool_passwd.c \
+ pool_signal.c \
+ strlcpy.c \
+ regex_array.c \
+ pool_config.l \
+ fe_port.c \
+ fe_memutils.c \
+ pool_globals.c
all: all-am
@@ -424,146 +424,32 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
-md5.o: $(top_srcdir)/src/auth/md5.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f '$(top_srcdir)/src/auth/md5.c' || echo '$(srcdir)/'`$(top_srcdir)/src/auth/md5.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/auth/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f '$(top_srcdir)/src/auth/md5.c' || echo '$(srcdir)/'`$(top_srcdir)/src/auth/md5.c
-
-md5.obj: $(top_srcdir)/src/auth/md5.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f '$(top_srcdir)/src/auth/md5.c'; then $(CYGPATH_W) '$(top_srcdir)/src/auth/md5.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/auth/md5.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/auth/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '$(top_srcdir)/src/auth/md5.c'; then $(CYGPATH_W) '$(top_srcdir)/src/auth/md5.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/auth/md5.c'; fi`
-
-pool_passwd.o: $(top_srcdir)/src/auth/pool_passwd.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pool_passwd.o -MD -MP -MF $(DEPDIR)/pool_passwd.Tpo -c -o pool_passwd.o `test -f '$(top_srcdir)/src/auth/pool_passwd.c' || echo '$(srcdir)/'`$(top_srcdir)/src/auth/pool_passwd.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pool_passwd.Tpo $(DEPDIR)/pool_passwd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/auth/pool_passwd.c' object='pool_passwd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pool_passwd.o `test -f '$(top_srcdir)/src/auth/pool_passwd.c' || echo '$(srcdir)/'`$(top_srcdir)/src/auth/pool_passwd.c
-
-pool_passwd.obj: $(top_srcdir)/src/auth/pool_passwd.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pool_passwd.obj -MD -MP -MF $(DEPDIR)/pool_passwd.Tpo -c -o pool_passwd.obj `if test -f '$(top_srcdir)/src/auth/pool_passwd.c'; then $(CYGPATH_W) '$(top_srcdir)/src/auth/pool_passwd.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/auth/pool_passwd.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pool_passwd.Tpo $(DEPDIR)/pool_passwd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/auth/pool_passwd.c' object='pool_passwd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pool_passwd.obj `if test -f '$(top_srcdir)/src/auth/pool_passwd.c'; then $(CYGPATH_W) '$(top_srcdir)/src/auth/pool_passwd.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/auth/pool_passwd.c'; fi`
-
-pool_signal.o: $(top_srcdir)/src/utils/pool_signal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pool_signal.o -MD -MP -MF $(DEPDIR)/pool_signal.Tpo -c -o pool_signal.o `test -f '$(top_srcdir)/src/utils/pool_signal.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pool_signal.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pool_signal.Tpo $(DEPDIR)/pool_signal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/pool_signal.c' object='pool_signal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pool_signal.o `test -f '$(top_srcdir)/src/utils/pool_signal.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/pool_signal.c
-
-pool_signal.obj: $(top_srcdir)/src/utils/pool_signal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pool_signal.obj -MD -MP -MF $(DEPDIR)/pool_signal.Tpo -c -o pool_signal.obj `if test -f '$(top_srcdir)/src/utils/pool_signal.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/pool_signal.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/pool_signal.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pool_signal.Tpo $(DEPDIR)/pool_signal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/pool_signal.c' object='pool_signal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pool_signal.obj `if test -f '$(top_srcdir)/src/utils/pool_signal.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/pool_signal.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/pool_signal.c'; fi`
-
-strlcpy.o: $(top_srcdir)/src/utils/strlcpy.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.o -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.o `test -f '$(top_srcdir)/src/utils/strlcpy.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/strlcpy.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/strlcpy.c' object='strlcpy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.o `test -f '$(top_srcdir)/src/utils/strlcpy.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/strlcpy.c
-
-strlcpy.obj: $(top_srcdir)/src/utils/strlcpy.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.obj -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.obj `if test -f '$(top_srcdir)/src/utils/strlcpy.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/strlcpy.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/strlcpy.c' object='strlcpy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.obj `if test -f '$(top_srcdir)/src/utils/strlcpy.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/strlcpy.c'; fi`
-
-regex_array.o: $(top_srcdir)/src/utils/regex_array.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regex_array.o -MD -MP -MF $(DEPDIR)/regex_array.Tpo -c -o regex_array.o `test -f '$(top_srcdir)/src/utils/regex_array.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/regex_array.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regex_array.Tpo $(DEPDIR)/regex_array.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/regex_array.c' object='regex_array.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regex_array.o `test -f '$(top_srcdir)/src/utils/regex_array.c' || echo '$(srcdir)/'`$(top_srcdir)/src/utils/regex_array.c
-
-regex_array.obj: $(top_srcdir)/src/utils/regex_array.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regex_array.obj -MD -MP -MF $(DEPDIR)/regex_array.Tpo -c -o regex_array.obj `if test -f '$(top_srcdir)/src/utils/regex_array.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/regex_array.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/regex_array.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regex_array.Tpo $(DEPDIR)/regex_array.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/utils/regex_array.c' object='regex_array.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regex_array.obj `if test -f '$(top_srcdir)/src/utils/regex_array.c'; then $(CYGPATH_W) '$(top_srcdir)/src/utils/regex_array.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/utils/regex_array.c'; fi`
-
-fe_port.o: $(top_srcdir)/src/tools/fe_port.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fe_port.o -MD -MP -MF $(DEPDIR)/fe_port.Tpo -c -o fe_port.o `test -f '$(top_srcdir)/src/tools/fe_port.c' || echo '$(srcdir)/'`$(top_srcdir)/src/tools/fe_port.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fe_port.Tpo $(DEPDIR)/fe_port.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/tools/fe_port.c' object='fe_port.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fe_port.o `test -f '$(top_srcdir)/src/tools/fe_port.c' || echo '$(srcdir)/'`$(top_srcdir)/src/tools/fe_port.c
-
-fe_port.obj: $(top_srcdir)/src/tools/fe_port.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fe_port.obj -MD -MP -MF $(DEPDIR)/fe_port.Tpo -c -o fe_port.obj `if test -f '$(top_srcdir)/src/tools/fe_port.c'; then $(CYGPATH_W) '$(top_srcdir)/src/tools/fe_port.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tools/fe_port.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fe_port.Tpo $(DEPDIR)/fe_port.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/tools/fe_port.c' object='fe_port.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fe_port.obj `if test -f '$(top_srcdir)/src/tools/fe_port.c'; then $(CYGPATH_W) '$(top_srcdir)/src/tools/fe_port.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tools/fe_port.c'; fi`
-
-fe_memutils.o: $(top_srcdir)/src/tools/fe_memutils.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fe_memutils.o -MD -MP -MF $(DEPDIR)/fe_memutils.Tpo -c -o fe_memutils.o `test -f '$(top_srcdir)/src/tools/fe_memutils.c' || echo '$(srcdir)/'`$(top_srcdir)/src/tools/fe_memutils.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fe_memutils.Tpo $(DEPDIR)/fe_memutils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/tools/fe_memutils.c' object='fe_memutils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fe_memutils.o `test -f '$(top_srcdir)/src/tools/fe_memutils.c' || echo '$(srcdir)/'`$(top_srcdir)/src/tools/fe_memutils.c
-
-fe_memutils.obj: $(top_srcdir)/src/tools/fe_memutils.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fe_memutils.obj -MD -MP -MF $(DEPDIR)/fe_memutils.Tpo -c -o fe_memutils.obj `if test -f '$(top_srcdir)/src/tools/fe_memutils.c'; then $(CYGPATH_W) '$(top_srcdir)/src/tools/fe_memutils.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tools/fe_memutils.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fe_memutils.Tpo $(DEPDIR)/fe_memutils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/tools/fe_memutils.c' object='fe_memutils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fe_memutils.obj `if test -f '$(top_srcdir)/src/tools/fe_memutils.c'; then $(CYGPATH_W) '$(top_srcdir)/src/tools/fe_memutils.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tools/fe_memutils.c'; fi`
-
-pool_globals.o: $(top_srcdir)/src/main/pool_globals.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pool_globals.o -MD -MP -MF $(DEPDIR)/pool_globals.Tpo -c -o pool_globals.o `test -f '$(top_srcdir)/src/main/pool_globals.c' || echo '$(srcdir)/'`$(top_srcdir)/src/main/pool_globals.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pool_globals.Tpo $(DEPDIR)/pool_globals.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/main/pool_globals.c' object='pool_globals.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pool_globals.o `test -f '$(top_srcdir)/src/main/pool_globals.c' || echo '$(srcdir)/'`$(top_srcdir)/src/main/pool_globals.c
-
-pool_globals.obj: $(top_srcdir)/src/main/pool_globals.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pool_globals.obj -MD -MP -MF $(DEPDIR)/pool_globals.Tpo -c -o pool_globals.obj `if test -f '$(top_srcdir)/src/main/pool_globals.c'; then $(CYGPATH_W) '$(top_srcdir)/src/main/pool_globals.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/main/pool_globals.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pool_globals.Tpo $(DEPDIR)/pool_globals.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/main/pool_globals.c' object='pool_globals.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pool_globals.obj `if test -f '$(top_srcdir)/src/main/pool_globals.c'; then $(CYGPATH_W) '$(top_srcdir)/src/main/pool_globals.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/main/pool_globals.c'; fi`
-
.l.c:
$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-pool_config.c: $(top_srcdir)/src/config/pool_config.l
- $(AM_V_LEX) \
- $(am__skiplex) \
- $(SHELL) $(YLWRAP) `test -f '$(top_srcdir)/src/config/pool_config.l' || echo '$(srcdir)/'`$(top_srcdir)/src/config/pool_config.l $(LEX_OUTPUT_ROOT).c pool_config.c -- $(LEX) $(AM_LFLAGS) $(LFLAGS)
-
mostlyclean-libtool:
-rm -f *.lo
@@ -777,6 +663,27 @@ uninstall-am: uninstall-binPROGRAMS
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+md5.c: ../../../src/auth/md5.c
+ rm -f $@ && ln -s $< .
+md5.h: ../../../src/include/auth/md5.h
+ rm -f $@ && ln -s $< .
+pool_passwd.c: ../../../src/auth/pool_passwd.c
+ rm -f $@ && ln -s $< .
+pool_signal.c: ../../../src/utils/pool_signal.c
+ rm -f $@ && ln -s $< .
+strlcpy.c: ../../../src/utils/strlcpy.c
+ rm -f $@ && ln -s $< .
+regex_array.c: ../../../src/utils/regex_array.c
+ rm -f $@ && ln -s $< .
+pool_config.l: ../../../src/config/pool_config.l
+ rm -f $@ && ln -s $< .
+fe_port.c: ../../../src/tools/fe_port.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 $< .
+
# 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 bd5e621d4..5c8ea7287 100644
--- a/src/watchdog/Makefile.in
+++ b/src/watchdog/Makefile.in
@@ -88,7 +88,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
$(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -374,22 +374,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd_ping.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
[parent: 743214342509]