Fix configure.ac to remove generating src/sql/pgpool_adm/Makefile.in.
authorTatsuo Ishii <ishii@postgresql.org>
Tue, 31 Jul 2018 01:10:26 +0000 (10:10 +0900)
committerTatsuo Ishii <ishii@postgresql.org>
Tue, 31 Jul 2018 01:10:26 +0000 (10:10 +0900)
Along with newer autoconf generated files.

Makefile.in
configure
configure.ac

index e49d06d552e9a4a0cac63a305a79acf5b2f23188..012e6a8c6c2cc948262145970c07b7516a0b5a6f 100644 (file)
@@ -104,7 +104,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/include/config.h
-CONFIG_CLEAN_FILES = src/sql/pgpool_adm/Makefile
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -163,11 +163,9 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-       $(top_srcdir)/src/sql/pgpool_adm/Makefile.in AUTHORS COPYING \
-       ChangeLog INSTALL NEWS README TODO compile config.guess \
-       config.sub depcomp install-sh ltmain.sh missing mkinstalldirs \
-       ylwrap
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+       INSTALL NEWS README TODO compile config.guess config.sub \
+       depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -391,8 +389,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-src/sql/pgpool_adm/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/sql/pgpool_adm/Makefile.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
        -rm -f *.lo
index 095eff20b6679f5aa43094c6fc87e7b9f99dde7b..41c9dd0f7b5aada05b6c356d7c0141e27a3a7de6 100755 (executable)
--- a/configure
+++ b/configure
@@ -14891,8 +14891,6 @@ $as_echo "enable cassert = $enable_cassert" >&6; }
 
 ac_config_headers="$ac_config_headers src/include/config.h"
 
-ac_config_files="$ac_config_files src/sql/pgpool_adm/Makefile"
-
 
 ac_config_files="$ac_config_files Makefile doc/Makefile doc/src/Makefile doc/src/sgml/Makefile doc.ja/Makefile doc.ja/src/Makefile doc.ja/src/sgml/Makefile src/Makefile src/include/Makefile src/parser/Makefile src/libs/Makefile src/libs/pcp/Makefile src/tools/Makefile src/tools/pgmd5/Makefile src/tools/pcp/Makefile src/watchdog/Makefile"
 
@@ -15910,7 +15908,6 @@ do
   case $ac_config_target in
     "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" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/src/Makefile") CONFIG_FILES="$CONFIG_FILES doc/src/Makefile" ;;
index 551a423cfa553e0b46b3e0ef3202a378baeaddfc..b1cc2476e89f7b9f8d77c52100679d926c1d1dd9 100644 (file)
@@ -427,6 +427,5 @@ fi
 AC_MSG_RESULT([enable cassert = $enable_cassert])
 
 AM_CONFIG_HEADER(src/include/config.h)
-AC_CONFIG_FILES([src/sql/pgpool_adm/Makefile])
 
 AC_OUTPUT([Makefile doc/Makefile  doc/src/Makefile doc/src/sgml/Makefile doc.ja/Makefile  doc.ja/src/Makefile doc.ja/src/sgml/Makefile src/Makefile src/include/Makefile src/parser/Makefile src/libs/Makefile src/libs/pcp/Makefile src/tools/Makefile src/tools/pgmd5/Makefile src/tools/pcp/Makefile src/watchdog/Makefile])