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

Commit07c6718

Browse files
committed
Avoid multiple scans of utils/mb/conversion_procs/ subdirectories during
'make install'; there are enough of 'em that this slowed down the makenoticeably. Ensure that 'all' is the default make target in all thesedirectories (defaulting to 'make install' is surprising and dangerousIMHO). Fix a couple small typos.
1 parentba98237 commit07c6718

File tree

6 files changed

+28
-23
lines changed

6 files changed

+28
-23
lines changed

‎src/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/Makefile,v 1.27 2002/07/30 17:47:58 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/Makefile,v 1.28 2002/09/04 15:45:50 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,6 +16,7 @@ include Makefile.global
1616
allinstallinstalldirsuninstalldepdependdistprep:
1717
$(MAKE) -C port$@
1818
$(MAKE) -C backend$@
19+
$(MAKE) -C backend/utils/mb/conversion_procs$@
1920
$(MAKE) -C include$@
2021
$(MAKE) -C interfaces$@
2122
$(MAKE) -C bin$@

‎src/Makefile.shlib

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.61 2002/09/03 17:17:24 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.62 2002/09/04 15:45:50 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -276,8 +276,13 @@ endif # enable_shared
276276
## BUILD
277277
##
278278

279-
.PHONY: all-lib
280-
all-lib: lib$(NAME).a $(shlib)
279+
.PHONY: all-lib all-static-lib all-shared-lib
280+
281+
all-lib: all-static-lib all-shared-lib
282+
283+
all-static-lib: lib$(NAME).a
284+
285+
all-shared-lib: $(shlib)
281286

282287
ifneq ($(PORTNAME), win)
283288

‎src/backend/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.85 2002/08/21 20:42:24 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.86 2002/09/04 15:45:50 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -30,7 +30,6 @@ endif
3030
##########################################################################
3131

3232
all: submake-libpgport postgres$(POSTGRES_IMP)
33-
$(MAKE) -C utils/mb/conversion_procs$@
3433

3534
ifneq ($(PORTNAME), win)
3635

@@ -122,8 +121,6 @@ endif
122121
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
123122
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
124123
$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
125-
$(MAKE) -C utils/mb $@
126-
$(MAKE) -C utils/mb/conversion_procs $@
127124

128125
install-bin: postgres$(POSTGRES_IMP) installdirs
129126
$(INSTALL_PROGRAM) postgres$(X)$(DESTDIR)$(bindir)/postgres$(X)

‎src/backend/utils/mb/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/mb
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.20 2002/08/08 07:47:43 ishii Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.21 2002/09/04 15:45:50 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,7 +15,9 @@ include $(top_builddir)/src/Makefile.global
1515
OBJS = encnames.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o
1616
DIRS = conversion_procs
1717

18-
allinstallinstalldirsuninstaldistprep: SUBSYS.o
18+
allinstallinstalldirs: SUBSYS.o
19+
20+
uninstalldistprep:
1921

2022
cleandistcleanmaintainer-clean:
2123
rm -f SUBSYS.o$(OBJS)

‎src/backend/utils/mb/conversion_procs/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/mb/conversion_procs
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.5 2002/08/22 00:01:44 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.6 2002/09/04 15:45:50 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -143,6 +143,9 @@ CONVERSIONS = \
143143
utf_8_to_win874 UNICODE WIN874 utf_to_win874 utf8_and_win874\
144144
win874_to_utf_8 WIN874 UNICODE win874_to_utf utf8_and_win874
145145

146+
all:$(SQLSCRIPT)
147+
@for dirin$(DIRS);do$(MAKE) -C$$dir$@||exit;done
148+
146149
$(SQLSCRIPT): Makefile
147150
@set$(CONVERSIONS);\
148151
while ["$$#"-gt 0 ]; \
@@ -174,21 +177,18 @@ $(REGRESSION_SCRIPT): Makefile
174177
done>>$@;\
175178
cat regress_epilogue>>$@;
176179

177-
install:all installdirs
180+
install:$(SQLSCRIPT) installdirs
178181
$(INSTALL_DATA)$(SQLSCRIPT)$(DESTDIR)$(datadir)
179182
@for dirin$(DIRS);do$(MAKE) -C$$dir$@||exit;done
180183

181184
installdirs:
182-
$(mkinstalldirs)$(DESTDIR)$(pkglibdir)
185+
$(mkinstalldirs)$(DESTDIR)$(datadir)$(DESTDIR)$(pkglibdir)
183186

184-
all:$(SQLSCRIPT)
185-
@for dirin$(DIRS);do$(MAKE) -C$$dir$@||exit;done
187+
uninstall:
186188

187-
clean:
188-
$(RM)$(SQLSCRIPT)
189-
@for dirin$(DIRS);do$(MAKE) -C$$dir$@;done
189+
depdependdistprep:
190190

191-
distcleanmaintainer-clean:
191+
cleandistcleanmaintainer-clean:
192192
$(RM)$(SQLSCRIPT)
193193
@for dirin$(DIRS);do$(MAKE) -C$$dir$@;done
194194

‎src/backend/utils/mb/conversion_procs/proc.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ SO_MAJOR_VERSION := 0
88
SO_MINOR_VERSION := 0
99
rpath =
1010

11+
all: all-shared-lib
12+
13+
include$(top_srcdir)/src/Makefile.shlib
14+
1115
install: all
1216
$(INSTALL_SHLIB)$(shlib)$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
1317

1418
uninstall: uninstall-lib
1519

1620
cleandistcleanmaintainer-clean: clean-lib
1721
$(RM)$(OBJS)
18-
19-
include$(top_srcdir)/src/Makefile.shlib
20-
21-
all:$(shlib)

0 commit comments

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