Skip to content

Commit fa179dd

Browse files
tglsfdctglsfdc
committed
Make sure symlinks for sharedlib get removed by 'make clean'.
1 parent 7bf29f6 commit fa179dd

File tree

6 files changed

+23
-19
lines changed

6 files changed

+23
-19
lines changed

‎src/interfaces/ecpg/lib/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.43 1999/02/23 12:56:55 scrappy Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.44 1999/06/30 23:57:23 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -41,8 +41,9 @@ typename.o : typename.c ../include/ecpgtype.h
4141

4242

4343
.PHONY: clean
44-
clean:
45-
rm -f lib$(NAME).a $(shlib) $(OBJS)
44+
45+
clean: clean-shlib
46+
rm -f lib$(NAME).a $(OBJS)
4647
ifeq ($(PORTNAME), win)
4748
rm -f $(NAME).def
4849
endif

‎src/interfaces/libpgtcl/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.34 1999/02/07 22:10:45 tgl Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.35 1999/06/30 23:57:24 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -50,8 +50,9 @@ beforeinstall-headers:
5050

5151

5252
.PHONY: clean
53-
clean:
54-
rm -f $(OBJS) $(shlib) lib$(NAME).a
53+
54+
clean: clean-shlib
55+
rm -f $(OBJS) lib$(NAME).a
5556

5657
depend dep:
5758
$(CC) -MM $(CFLAGS) *.c >depend

‎src/interfaces/libpq++/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.14 1999/05/27 14:28:40 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.15 1999/06/30 23:57:27 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -87,8 +87,9 @@ beforeinstall-headers:
8787
@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
8888

8989
.PHONY: clean
90-
clean:
91-
rm -f libpq++.a $(shlib) $(OBJS)
90+
91+
clean: clean-shlib
92+
rm -f libpq++.a $(OBJS)
9293
$(MAKE) -C examples clean
9394

9495
dep depend:

‎src/interfaces/libpq/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.45 1999/03/07 23:05:57 tgl Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.46 1999/06/30 23:57:25 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -83,8 +83,9 @@ install-headers: libpq-fe.h libpq-int.h
8383

8484

8585
.PHONY: clean
86-
clean:
87-
rm -f libpq.a $(shlib) $(OBJS)
86+
87+
clean: clean-shlib
88+
rm -f libpq.a $(OBJS)
8889
rm -f dllist.c common.c wchar.c conv.c big5.c
8990
ifeq ($(PORTNAME), win)
9091
rm -f pq.def

‎src/interfaces/odbc/GNUmakefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.10 1999/01/17 06:19:43 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.11 1999/06/30 23:57:29 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313
@SET_MAKE@
@@ -65,8 +65,8 @@ install-ini: odbcinst.ini
6565

6666
.PHONY: clean
6767

68-
clean:
69-
-rm -f lib$(NAME).a $(shlib) $(OBJS)
68+
clean: clean-shlib
69+
-rm -f lib$(NAME).a $(OBJS)
7070

7171
.PHONY: distclean
7272

@@ -76,7 +76,7 @@ distclean: clean
7676
ifeq ($(PORTNAME), win)
7777
@if [ $SRCDIR != $ODBCSRCDIR ]; then rm -f template makefiles port; fi
7878
else
79-
@if [ $SRCDIR ne $ODBCSRCDIR ]; then rm -f template makefiles port
79+
@if [ $SRCDIR ne $ODBCSRCDIR ]; then rm -f template makefiles port; fi
8080
endif
8181

8282
.PHONY: standalone

‎src/pl/plpgsql/src/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the plpgsql shared object
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.16 1999/03/21 02:27:46 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.17 1999/06/30 23:57:31 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -77,8 +77,8 @@ pl_scan.c: scan.l
7777

7878
.PHONY: install clean
7979

80-
clean:
81-
rm -f lib$(NAME).a $(shlib)
80+
clean: clean-shlib
81+
rm -f lib$(NAME).a
8282
rm -f *.o pl.tab.h pl_gram.c pl_scan.c
8383
# And the garbage that might have been left behind by partial build:
8484
rm -f y.tab.c y.tab.h lex.yy.c

0 commit comments

Comments
 (0)