pgpool2.git / summary / log / commit / refs
commit 5f401b3aa07009fbf3525491b957b9d700359fd7
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Thu Oct 29 03:10:54 2015 +0000
Unbreak "make dist".
While removing parallel query etc., Makefile.am was left unchanged and
"make dist" has been broken since then.
src/Makefile.am | 15 ---------------
src/Makefile.in | 15 ---------------
src/include/Makefile.am | 2 +-
src/include/Makefile.in | 2 +-
4 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index d1187bd2b..a236dfc59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,7 +83,6 @@ EXTRA_DIST = sample/pgpool.pam \
sample/pgpool.conf.sample sample/pool_hba.conf.sample \
sample/pgpool.conf.sample-replication sample/pgpool.conf.sample-master-slave \
sample/pgpool.conf.sample-stream sample/pcp.conf.sample \
- sample/dist_def_pgbench.sql sample/replicate_def_pgbench.sql \
sql/Makefile \
sql/insert_lock.sql \
sql/pgpool-recovery/pgpool-recovery.c \
@@ -128,26 +127,12 @@ EXTRA_DIST = sample/pgpool.pam \
test/parser/pool.h test/parser/run-test \
test/parser/parse_schedule \
test/C/Makefile test/C/test_extended.c \
- test/jdbc/*.java test/jdbc/README.euc_jp test/jdbc/pgpool.properties test/jdbc/prepare.sql test/jdbc/run.sh \
- test/jdbc/expected/autocommit test/jdbc/expected/batch \
- test/jdbc/expected/column test/jdbc/expected/lock test/jdbc/expected/select \
- test/jdbc/expected/update test/jdbc/expected/insert test/jdbc/expected/CreateTempTable \
test/pdo-test/README.euc_jp test/pdo-test/collections.inc test/pdo-test/def.inc \
test/pdo-test/pdotest.php test/pdo-test/regsql.inc \
test/pdo-test/SQLlist/test1.sql test/pdo-test/SQLlist/test2.sql \
test/pdo-test/mod/database.inc test/pdo-test/mod/errorhandler.inc \
- test/timestamp/Makefile test/timestamp/input/insert.sql \
- test/timestamp/input/update.sql test/timestamp/input/misc.sql \
- test/timestamp/expected/insert.out test/timestamp/expected/update.out \
- test/timestamp/expected/misc.out test/timestamp/main.c \
- test/timestamp/parse_schedule test/timestamp/run-test \
test/pgpool_setup test/regression \
redhat/pgpool.init redhat/pgpool.sysconfig redhat/pgpool.conf.sample.patch \
- redhat/rpm_installer/getsources.sh redhat/rpm_installer/config_for_script \
- redhat/rpm_installer/install.sh redhat/rpm_installer/uninstall.sh \
- redhat/rpm_installer/basebackup-replication.sh redhat/rpm_installer/basebackup-stream.sh \
- redhat/rpm_installer/pgpool_recovery_pitr redhat/rpm_installer/pgpool_remote_start \
- redhat/rpm_installer/recovery.conf redhat/rpm_installer/failover.sh \
pgpool.spec
diff --git a/src/Makefile.in b/src/Makefile.in
index 93fa3e23d..95d1c3192 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -485,7 +485,6 @@ EXTRA_DIST = sample/pgpool.pam \
sample/pgpool.conf.sample sample/pool_hba.conf.sample \
sample/pgpool.conf.sample-replication sample/pgpool.conf.sample-master-slave \
sample/pgpool.conf.sample-stream sample/pcp.conf.sample \
- sample/dist_def_pgbench.sql sample/replicate_def_pgbench.sql \
sql/Makefile \
sql/insert_lock.sql \
sql/pgpool-recovery/pgpool-recovery.c \
@@ -530,26 +529,12 @@ EXTRA_DIST = sample/pgpool.pam \
test/parser/pool.h test/parser/run-test \
test/parser/parse_schedule \
test/C/Makefile test/C/test_extended.c \
- test/jdbc/*.java test/jdbc/README.euc_jp test/jdbc/pgpool.properties test/jdbc/prepare.sql test/jdbc/run.sh \
- test/jdbc/expected/autocommit test/jdbc/expected/batch \
- test/jdbc/expected/column test/jdbc/expected/lock test/jdbc/expected/select \
- test/jdbc/expected/update test/jdbc/expected/insert test/jdbc/expected/CreateTempTable \
test/pdo-test/README.euc_jp test/pdo-test/collections.inc test/pdo-test/def.inc \
test/pdo-test/pdotest.php test/pdo-test/regsql.inc \
test/pdo-test/SQLlist/test1.sql test/pdo-test/SQLlist/test2.sql \
test/pdo-test/mod/database.inc test/pdo-test/mod/errorhandler.inc \
- test/timestamp/Makefile test/timestamp/input/insert.sql \
- test/timestamp/input/update.sql test/timestamp/input/misc.sql \
- test/timestamp/expected/insert.out test/timestamp/expected/update.out \
- test/timestamp/expected/misc.out test/timestamp/main.c \
- test/timestamp/parse_schedule test/timestamp/run-test \
test/pgpool_setup test/regression \
redhat/pgpool.init redhat/pgpool.sysconfig redhat/pgpool.conf.sample.patch \
- redhat/rpm_installer/getsources.sh redhat/rpm_installer/config_for_script \
- redhat/rpm_installer/install.sh redhat/rpm_installer/uninstall.sh \
- redhat/rpm_installer/basebackup-replication.sh redhat/rpm_installer/basebackup-stream.sh \
- redhat/rpm_installer/pgpool_recovery_pitr redhat/rpm_installer/pgpool_remote_start \
- redhat/rpm_installer/recovery.conf redhat/rpm_installer/failover.sh \
pgpool.spec
SUBDIRS = parser libs watchdog . tools include
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 2a358c024..bfc3c7ee3 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -4,5 +4,5 @@ DEFS = @DEFS@ \
-DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
EXTRA_DIST = auth \
- context parallel_query query_cache\
+ context query_cache\
parser pool.h pcp pool_type.h pool_config.h protocol rewrite version.h utils watchdog config.h config.h.in
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index bd5c09aa2..7bc76c808 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
# suggested by libtoolize
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = auth \
- context parallel_query query_cache\
+ context query_cache\
parser pool.h pcp pool_type.h pool_config.h protocol rewrite version.h utils watchdog config.h config.h.in
all: config.h
[parent: 71111e043fb9]