From eefd10c66c5132521366ca1b48e3e3eafbf91d8b Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 5 Oct 2007 01:51:40 +0000
Subject: [PATCH] Fix distprep and maintainer-clean targets so that ecpg's .def
 files are made and removed at the correct times.

---
 src/interfaces/ecpg/compatlib/Makefile  | 14 +++++++++++---
 src/interfaces/ecpg/ecpglib/Makefile    | 13 ++++++++++---
 src/interfaces/ecpg/pgtypeslib/Makefile | 13 ++++++++++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile
index 47b2eabc22..d6e8ba54cb 100644
--- a/src/interfaces/ecpg/compatlib/Makefile
+++ b/src/interfaces/ecpg/compatlib/Makefile
@@ -2,9 +2,10 @@
 #
 # Makefile for ecpg compatibility library
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.35 2007/10/04 18:32:07 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.36 2007/10/05 01:51:40 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -46,8 +47,12 @@ snprintf.c: % : $(top_srcdir)/src/port/%
 # Since we can't assume that Windows boxes will have sed, the .DEF files are
 # always built and included in distribution tarballs.
 
+distprep: def-files
+
 .PHONY: def-files
+
 def-files: $(srcdir)/libecpg_compatdll.def $(srcdir)/blibecpg_compatdll.def
+
 $(srcdir)/libecpg_compatdll.def: exports.txt
 	echo '; DEF file for MS VC++' > $@
 	echo 'LIBRARY LIBECPG_COMPAT' >> $@
@@ -93,5 +98,8 @@ installdirs:
 
 uninstall: uninstall-lib
 
-clean distclean maintainer-clean: clean-lib
+clean distclean: clean-lib
 	rm -f $(OBJS) snprintf.c exports.list
+
+maintainer-clean: distclean
+	rm -f $(srcdir)/libecpg_compatdll.def $(srcdir)/blibecpg_compatdll.def
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index 5b019aead4..ee8c2ccce1 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -2,9 +2,10 @@
 #
 # Makefile for ecpg library
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.52 2007/10/04 20:54:08 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.53 2007/10/05 01:51:40 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -64,7 +65,10 @@ $(top_builddir)/src/port/pg_config_paths.h:
 # Since we can't assume that Windows boxes will have sed, the .DEF files are
 # always built and included in distribution tarballs.
 
+distprep: def-files
+
 .PHONY: def-files
+
 def-files: $(srcdir)/libecpgdll.def $(srcdir)/blibecpgdll.def
 
 $(srcdir)/libecpgdll.def: exports.txt
@@ -112,6 +116,9 @@ installdirs:
 
 uninstall: uninstall-lib
 
-clean distclean maintainer-clean: clean-lib
+clean distclean: clean-lib
 	rm -f $(OBJS)
 	rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c exports.list
+
+maintainer-clean: distclean
+	rm -f $(srcdir)/libecpgdll.def $(srcdir)/blibecpgdll.def
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
index 6008dd1215..d585e70b24 100644
--- a/src/interfaces/ecpg/pgtypeslib/Makefile
+++ b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -2,9 +2,10 @@
 #
 # Makefile for ecpg pgtypes library
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.37 2007/10/04 18:32:07 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.38 2007/10/05 01:51:40 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -44,7 +45,10 @@ include $(top_srcdir)/src/Makefile.shlib
 # Since we can't assume that Windows boxes will have sed, the .DEF files are
 # always built and included in distribution tarballs.
 
+distprep: def-files
+
 .PHONY: def-files
+
 def-files: $(srcdir)/libpgtypesdll.def $(srcdir)/blibpgtypesdll.def
 
 $(srcdir)/libpgtypesdll.def: exports.txt
@@ -100,5 +104,8 @@ installdirs:
 
 uninstall: uninstall-lib
 
-clean distclean maintainer-clean: clean-lib
+clean distclean: clean-lib
 	rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c exports.list
+
+maintainer-clean: distclean
+	rm -f $(srcdir)/libpgtypesdll.def $(srcdir)/blibpgtypesdll.def
-- 
GitLab