From fa179dde82da89842a93a1efd916a6751a37eac9 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 30 Jun 1999 23:57:31 +0000
Subject: [PATCH] Make sure symlinks for sharedlib get removed by 'make clean'.

---
 src/interfaces/ecpg/lib/Makefile.in | 7 ++++---
 src/interfaces/libpgtcl/Makefile.in | 7 ++++---
 src/interfaces/libpq++/Makefile.in  | 7 ++++---
 src/interfaces/libpq/Makefile.in    | 7 ++++---
 src/interfaces/odbc/GNUmakefile.in  | 8 ++++----
 src/pl/plpgsql/src/Makefile.in      | 6 +++---
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index ef2373fa78e..c7b4c80e06e 100644
--- a/src/interfaces/ecpg/lib/Makefile.in
+++ b/src/interfaces/ecpg/lib/Makefile.in
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.43 1999/02/23 12:56:55 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.44 1999/06/30 23:57:23 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -41,8 +41,9 @@ typename.o : typename.c ../include/ecpgtype.h
 
 
 .PHONY: clean
-clean:
-	rm -f lib$(NAME).a $(shlib) $(OBJS)
+
+clean: clean-shlib
+	rm -f lib$(NAME).a $(OBJS)
 ifeq ($(PORTNAME), win)
 	rm -f $(NAME).def
 endif
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index e58b4719ae5..1912c1198ca 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.34 1999/02/07 22:10:45 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.35 1999/06/30 23:57:24 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -50,8 +50,9 @@ beforeinstall-headers:
 
 
 .PHONY: clean
-clean: 
-	rm -f $(OBJS) $(shlib) lib$(NAME).a
+
+clean: clean-shlib
+	rm -f $(OBJS) lib$(NAME).a
 
 depend dep:
 	$(CC) -MM $(CFLAGS) *.c >depend
diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index f661d9bf6d1..1ad5c3017ac 100644
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.14 1999/05/27 14:28:40 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.15 1999/06/30 23:57:27 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -87,8 +87,9 @@ beforeinstall-headers:
 	@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
 
 .PHONY: clean
-clean:
-	rm -f libpq++.a $(shlib) $(OBJS)
+
+clean: clean-shlib
+	rm -f libpq++.a $(OBJS)
 	$(MAKE) -C examples clean
 
 dep depend:
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 8b07a9396a7..73f333cae12 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.45 1999/03/07 23:05:57 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.46 1999/06/30 23:57:25 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -83,8 +83,9 @@ install-headers: libpq-fe.h libpq-int.h
 
 
 .PHONY: clean
-clean:
-	rm -f libpq.a $(shlib) $(OBJS)
+
+clean: clean-shlib
+	rm -f libpq.a $(OBJS)
 	rm -f dllist.c common.c wchar.c conv.c big5.c
 ifeq ($(PORTNAME), win)
 	rm -f pq.def
diff --git a/src/interfaces/odbc/GNUmakefile.in b/src/interfaces/odbc/GNUmakefile.in
index 0835bd53b5a..79883ab79fe 100644
--- a/src/interfaces/odbc/GNUmakefile.in
+++ b/src/interfaces/odbc/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.10 1999/01/17 06:19:43 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.11 1999/06/30 23:57:29 tgl Exp $
 #
 #-------------------------------------------------------------------------
 @SET_MAKE@
@@ -65,8 +65,8 @@ install-ini: odbcinst.ini
 
 .PHONY: clean
 
-clean:
-	-rm -f lib$(NAME).a $(shlib) $(OBJS)
+clean: clean-shlib
+	-rm -f lib$(NAME).a $(OBJS)
 
 .PHONY: distclean
 
@@ -76,7 +76,7 @@ distclean: clean
 ifeq ($(PORTNAME), win)
 	@if [ $SRCDIR != $ODBCSRCDIR ]; then rm -f template makefiles port; fi
 else
-	@if [ $SRCDIR ne $ODBCSRCDIR ]; then rm -f template makefiles port
+	@if [ $SRCDIR ne $ODBCSRCDIR ]; then rm -f template makefiles port; fi
 endif
 
 .PHONY: standalone
diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in
index 9178399f44b..c69fdb7af69 100644
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@@ -4,7 +4,7 @@
 #    Makefile for the plpgsql shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.16 1999/03/21 02:27:46 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.17 1999/06/30 23:57:31 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -77,8 +77,8 @@ pl_scan.c:	scan.l
 
 .PHONY: install clean
 
-clean:
-	rm -f lib$(NAME).a $(shlib)
+clean: clean-shlib
+	rm -f lib$(NAME).a
 	rm -f *.o pl.tab.h pl_gram.c pl_scan.c
 # And the garbage that might have been left behind by partial build:
 	rm -f y.tab.c y.tab.h lex.yy.c
-- 
GitLab