Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteefd10c

Browse files
committed
Fix distprep and maintainer-clean targets so that ecpg's .def files are
made and removed at the correct times.
1 parentb8f41d5 commiteefd10c

File tree

3 files changed

+31
-9
lines changed

3 files changed

+31
-9
lines changed

‎src/interfaces/ecpg/compatlib/Makefile‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
#
33
# Makefile for ecpg compatibility library
44
#
5-
# Copyright (c) 1994, Regents of the University of California
5+
# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
6+
# Portions Copyright (c) 1994, Regents of the University of California
67
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.35 2007/10/04 18:32:07 tgl Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.36 2007/10/05 01:51:40 tgl Exp $
89
#
910
#-------------------------------------------------------------------------
1011

@@ -46,8 +47,12 @@ snprintf.c: % : $(top_srcdir)/src/port/%
4647
# Since we can't assume that Windows boxes will have sed, the .DEF files are
4748
# always built and included in distribution tarballs.
4849

50+
distprep: def-files
51+
4952
.PHONY: def-files
53+
5054
def-files:$(srcdir)/libecpg_compatdll.def$(srcdir)/blibecpg_compatdll.def
55+
5156
$(srcdir)/libecpg_compatdll.def: exports.txt
5257
echo'; DEF file for MS VC++'>$@
5358
echo'LIBRARY LIBECPG_COMPAT'>>$@
@@ -93,5 +98,8 @@ installdirs:
9398

9499
uninstall: uninstall-lib
95100

96-
cleandistcleanmaintainer-clean: clean-lib
101+
cleandistclean: clean-lib
97102
rm -f$(OBJS) snprintf.c exports.list
103+
104+
maintainer-clean: distclean
105+
rm -f$(srcdir)/libecpg_compatdll.def$(srcdir)/blibecpg_compatdll.def

‎src/interfaces/ecpg/ecpglib/Makefile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
#
33
# Makefile for ecpg library
44
#
5-
# Copyright (c) 1994, Regents of the University of California
5+
# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
6+
# Portions Copyright (c) 1994, Regents of the University of California
67
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.52 2007/10/04 20:54:08 tgl Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.53 2007/10/05 01:51:40 tgl Exp $
89
#
910
#-------------------------------------------------------------------------
1011

@@ -64,7 +65,10 @@ $(top_builddir)/src/port/pg_config_paths.h:
6465
# Since we can't assume that Windows boxes will have sed, the .DEF files are
6566
# always built and included in distribution tarballs.
6667

68+
distprep: def-files
69+
6770
.PHONY: def-files
71+
6872
def-files:$(srcdir)/libecpgdll.def$(srcdir)/blibecpgdll.def
6973

7074
$(srcdir)/libecpgdll.def: exports.txt
@@ -112,6 +116,9 @@ installdirs:
112116

113117
uninstall: uninstall-lib
114118

115-
cleandistcleanmaintainer-clean: clean-lib
119+
cleandistclean: clean-lib
116120
rm -f$(OBJS)
117121
rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c exports.list
122+
123+
maintainer-clean: distclean
124+
rm -f$(srcdir)/libecpgdll.def$(srcdir)/blibecpgdll.def

‎src/interfaces/ecpg/pgtypeslib/Makefile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
#
33
# Makefile for ecpg pgtypes library
44
#
5-
# Copyright (c) 1994, Regents of the University of California
5+
# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
6+
# Portions Copyright (c) 1994, Regents of the University of California
67
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.37 2007/10/04 18:32:07 tgl Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.38 2007/10/05 01:51:40 tgl Exp $
89
#
910
#-------------------------------------------------------------------------
1011

@@ -44,7 +45,10 @@ include $(top_srcdir)/src/Makefile.shlib
4445
# Since we can't assume that Windows boxes will have sed, the .DEF files are
4546
# always built and included in distribution tarballs.
4647

48+
distprep: def-files
49+
4750
.PHONY: def-files
51+
4852
def-files:$(srcdir)/libpgtypesdll.def$(srcdir)/blibpgtypesdll.def
4953

5054
$(srcdir)/libpgtypesdll.def: exports.txt
@@ -100,5 +104,8 @@ installdirs:
100104

101105
uninstall: uninstall-lib
102106

103-
cleandistcleanmaintainer-clean: clean-lib
107+
cleandistclean: clean-lib
104108
rm -f$(OBJS) pgstrcasecmp.c rint.c snprintf.c exports.list
109+
110+
maintainer-clean: distclean
111+
rm -f$(srcdir)/libpgtypesdll.def$(srcdir)/blibpgtypesdll.def

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp