diff options
| author | Michael Paquier | 2012-11-01 00:00:33 +0000 |
|---|---|---|
| committer | Michael Paquier | 2012-11-01 00:02:30 +0000 |
| commit | f117dc363e05bd79245c8739a12e0428a67c45f4 (patch) | |
| tree | 836bfd0d2ffd1481bfc390533d3ad4eddf1e14ee | |
| parent | 714e09b2b65e268b3ee167c1edf35fdfb05bad85 (diff) | |
Move gtm_ctl from src/gtm to src/bin
Like initgtm, gtm_ctl is a wrapper helping to perform operations on GTM the
same way pg_ctl operates with PG servers, so it makes sense to move its code
there and clean at the same time a bit the GTM core code tree.
It is important to note that gtm_ctl has dependencies with GTM client libraries
as those functions are used for things like reconnection of a Proxy to a GTM.
| -rw-r--r-- | src/bin/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/gtm_ctl/.gitignore (renamed from src/gtm/gtm_ctl/.gitignore) | 0 | ||||
| -rw-r--r-- | src/bin/gtm_ctl/Makefile (renamed from src/gtm/gtm_ctl/Makefile) | 10 | ||||
| -rw-r--r-- | src/bin/gtm_ctl/gtm_ctl.c (renamed from src/gtm/gtm_ctl/gtm_ctl.c) | 0 | ||||
| -rw-r--r-- | src/gtm/Makefile | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/Makefile b/src/bin/Makefile index 7498395022..b02c3caca6 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -13,7 +13,7 @@ subdir = src/bin top_builddir = ../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = initdb initgtm pg_ctl pg_dump \ +SUBDIRS = gtm_ctl initdb initgtm pg_ctl pg_dump \ psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup ifeq ($(PORTNAME), win32) diff --git a/src/gtm/gtm_ctl/.gitignore b/src/bin/gtm_ctl/.gitignore index ffe90d63fc..ffe90d63fc 100644 --- a/src/gtm/gtm_ctl/.gitignore +++ b/src/bin/gtm_ctl/.gitignore diff --git a/src/gtm/gtm_ctl/Makefile b/src/bin/gtm_ctl/Makefile index 8cfe3321cb..48750dfade 100644 --- a/src/gtm/gtm_ctl/Makefile +++ b/src/bin/gtm_ctl/Makefile @@ -4,12 +4,12 @@ # # Copyright(c) 2010-2012 Postgres-XC Development Group # -# src/gtm/gtm_ctl/Makefile +# src/bin/gtm_ctl/Makefile # #----------------------------------------------------------------------------- top_builddir=../../.. include $(top_builddir)/src/Makefile.global -subdir=src/gtm/gtm_ctl +subdir=src/bin/gtm_ctl override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) @@ -37,10 +37,10 @@ clean distclean maintainer-clean: # Be sure that the necessary archives are compiled $(top_builddir)/src/interfaces/libpq/libpq.a: - $(MAKE) -C ../../interfaces/libpq libpq.a + $(MAKE) -C $(top_builddir)/src/interfaces/libpq libpq.a $(top_builddir)/src/gtm/common/libgtmcommon.a: - $(MAKE) -C ../../gtm/common libgtmcommon.a + $(MAKE) -C $(top_builddir)/src/gtm/common libgtmcommon.a $(top_builddir)/src/gtm/client/libgtmclient.a: - $(MAKE) -C ../../gtm/client libgtmclient.a + $(MAKE) -C $(top_builddir)/src/gtm/client libgtmclient.a diff --git a/src/gtm/gtm_ctl/gtm_ctl.c b/src/bin/gtm_ctl/gtm_ctl.c index 9f2143c0d2..9f2143c0d2 100644 --- a/src/gtm/gtm_ctl/gtm_ctl.c +++ b/src/bin/gtm_ctl/gtm_ctl.c diff --git a/src/gtm/Makefile b/src/gtm/Makefile index 26a4b6f0da..5059642637 100644 --- a/src/gtm/Makefile +++ b/src/gtm/Makefile @@ -12,6 +12,6 @@ subdir = src/gtm top_builddir = ../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = client common config gtm_ctl libpq main path proxy recovery +SUBDIRS = client common config libpq main path proxy recovery $(recurse) |