From 4f9fc5687122fae43e0fb3a240150739abd933cb Mon Sep 17 00:00:00 2001
From: John Naylor <john.naylor@2ndquadrant.com>
Date: Fri, 15 Mar 2019 14:37:33 +0800
Subject: [PATCH] Fix assorted Makefile bugs

1. The target additional-maintainer-clean was misspelled as
maintainer-additional-clean.

2. Add add missing clean targets, in particular sysutils.o, config.h,
repmgr_version.h, and Makefile.global. While at it, use a wildcard
for obj files.

3. Don't delete configure.

4. Remove generated file doc/version.sgml from the repo.

5. Have maintainer-clean recurse to the doc directory.
---
 Makefile.in      | 26 ++++++--------------------
 doc/Makefile.in  |  2 +-
 doc/version.sgml |  1 -
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 doc/version.sgml

diff --git a/Makefile.in b/Makefile.in
index 53ede982..8b177b1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,29 +86,15 @@ clean: additional-clean
 maintainer-clean: additional-maintainer-clean
 
 additional-clean:
-	rm -f repmgr-client.o
-	rm -f repmgr-action-primary.o
-	rm -f repmgr-action-standby.o
-	rm -f repmgr-action-witness.o
-	rm -f repmgr-action-bdr.o
-	rm -f repmgr-action-node.o
-	rm -f repmgr-action-cluster.o
-	rm -f repmgr-action-daemon.o
-	rm -f repmgrd.o
-	rm -f repmgrd-physical.o
-	rm -f repmgrd-bdr.o
-	rm -f compat.o
-	rm -f configfile.o
-	rm -f controldata.o
-	rm -f dbutils.o
-	rm -f dirutil.o
-	rm -f log.o
-	rm -f strutil.o
+	rm -f *.o
 
-maintainer-additional-clean: clean
-	rm -f configure
+additional-maintainer-clean: clean
+	$(MAKE) -C doc maintainer-clean
 	rm -f config.status config.log
+	rm -f config.h
+	rm -f repmgr_version.h
 	rm -f Makefile
+	rm -f Makefile.global
 	@rm -rf autom4te.cache/
 
 ifeq ($(MAJORVERSION),$(filter $(MAJORVERSION),9.3 9.4))
diff --git a/doc/Makefile.in b/doc/Makefile.in
index acfc47de..6fbd8de7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -61,7 +61,7 @@ clean:
 
 maintainer-clean:
 	rm -rf html
-	rm -rf Makefile
+	rm -f Makefile
 
 zip: html
 	cp -r html repmgr-docs-$(REPMGR_VERSION)
diff --git a/doc/version.sgml b/doc/version.sgml
deleted file mode 100644
index 1262debc..00000000
--- a/doc/version.sgml
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY repmgrversion "4.3dev">