summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavan Deolasee2016-02-08 05:36:30 +0000
committerPavan Deolasee2016-10-18 09:48:14 +0000
commit3366f09175bf4bd77b6a0decba38cb3b32e73dca (patch)
tree618081bced91282d329901bce19c0697a36d9c0e
parentb7f660d98c6b5a6e5d15daaeaec5b0b7e92b9a40 (diff)
Standardize "subdir = <name>" in the Makefile(s)
-rw-r--r--src/gtm/client/Makefile2
-rw-r--r--src/gtm/common/Makefile2
-rw-r--r--src/gtm/common/elog.c3
-rw-r--r--src/gtm/config/Makefile2
-rw-r--r--src/gtm/gtm_ctl/Makefile2
-rw-r--r--src/gtm/libpq/Makefile2
-rw-r--r--src/gtm/main/Makefile2
-rw-r--r--src/gtm/path/Makefile2
-rw-r--r--src/gtm/proxy/Makefile2
-rw-r--r--src/gtm/recovery/Makefile2
10 files changed, 11 insertions, 10 deletions
diff --git a/src/gtm/client/Makefile b/src/gtm/client/Makefile
index bedbaf8cbf..f1e9cdb579 100644
--- a/src/gtm/client/Makefile
+++ b/src/gtm/client/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/client
+subdir = src/gtm/client
NAME=gtmclient
SO_MAJOR_VERSION= 1
diff --git a/src/gtm/common/Makefile b/src/gtm/common/Makefile
index cb58dc998e..b059a27ec7 100644
--- a/src/gtm/common/Makefile
+++ b/src/gtm/common/Makefile
@@ -8,7 +8,7 @@
#
#-----------------------------------------------------------------------------
top_builddir=../../..
-subdir=src/gtm/common
+subdir = src/gtm/common
include $(top_builddir)/src/Makefile.global
diff --git a/src/gtm/common/elog.c b/src/gtm/common/elog.c
index 70e0c95a9b..a08dfd292f 100644
--- a/src/gtm/common/elog.c
+++ b/src/gtm/common/elog.c
@@ -609,7 +609,8 @@ elog_finish(int elevel, const char *fmt,...)
*/
errordata_stack_depth--;
errno = edata->saved_errno;
- if (!errstart(elevel, edata->filename, edata->lineno, edata->funcname, NULL))
+ if (!errstart(elevel, edata->filename, edata->lineno, edata->funcname,
+ NULL))
return; /* nothing to do */
/*
diff --git a/src/gtm/config/Makefile b/src/gtm/config/Makefile
index e0a7c8f300..e8f253e654 100644
--- a/src/gtm/config/Makefile
+++ b/src/gtm/config/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/config
+subdir = src/gtm/config
override CPPFLAGS := -I. -I$(libpq_srcdir) $(CPPFLAGS)
LIBS += $(PTHREAD_LIBS)
diff --git a/src/gtm/gtm_ctl/Makefile b/src/gtm/gtm_ctl/Makefile
index 6b079b7832..03bd792a07 100644
--- a/src/gtm/gtm_ctl/Makefile
+++ b/src/gtm/gtm_ctl/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/gtm_ctl
+subdir = src/gtm/gtm_ctl
OBJS=gtm_ctl.o
diff --git a/src/gtm/libpq/Makefile b/src/gtm/libpq/Makefile
index dd22b0dcb1..21f91a390c 100644
--- a/src/gtm/libpq/Makefile
+++ b/src/gtm/libpq/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/libpq
+subdir = src/gtm/libpq
NAME=pqcomm
SO_MAJOR_VERSION= 1
diff --git a/src/gtm/main/Makefile b/src/gtm/main/Makefile
index 208b2297c7..ebd22fc2d8 100644
--- a/src/gtm/main/Makefile
+++ b/src/gtm/main/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/main
+subdir = src/gtm/main
ifneq ($(PORTNAME), win32)
override CFLAGS += $(PTHREAD_CFLAGS)
diff --git a/src/gtm/path/Makefile b/src/gtm/path/Makefile
index 186b3b1876..d573848cd7 100644
--- a/src/gtm/path/Makefile
+++ b/src/gtm/path/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/path
+subdir = src/gtm/path
NAME=gtmpath
SO_MAJOR_VERSION= 1
diff --git a/src/gtm/proxy/Makefile b/src/gtm/proxy/Makefile
index fe350113a9..ee0aa1cdd8 100644
--- a/src/gtm/proxy/Makefile
+++ b/src/gtm/proxy/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/proxy
+subdir = src/gtm/proxy
ifneq ($(PORTNAME), win32)
override CFLAGS += $(PTHREAD_CFLAGS)
diff --git a/src/gtm/recovery/Makefile b/src/gtm/recovery/Makefile
index e98e0f69fd..89529a31b3 100644
--- a/src/gtm/recovery/Makefile
+++ b/src/gtm/recovery/Makefile
@@ -9,7 +9,7 @@
#-----------------------------------------------------------------------------
top_builddir=../../..
include $(top_builddir)/src/Makefile.global
-subdir=src/gtm/recovery
+subdir = src/gtm/recovery
NAME=gtmrecovery
SO_MAJOR_VERSION= 1