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

Commitf362dce

Browse files
committed
Move
 src/GNUmakefile.in to src/Makefileand src/backend/port/Makefile.in to src/backend/port/MakefileAll configure substitutions are now done in Makefile.global.
1 parentcf6a73d commitf362dce

File tree

7 files changed

+68
-106
lines changed

7 files changed

+68
-106
lines changed

‎configure‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9102,9 +9102,7 @@ ac_given_srcdir=$srcdir
91029102
91039103
trap 'rm -fr`echo"
91049104
GNUmakefile
9105-
src/GNUmakefile
91069105
src/Makefile.global
9107-
src/backend/port/Makefile
91089106
src/include/pg_config.h"| sed"s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
91099107
EOF
91109108
cat>>$CONFIG_STATUS<<EOF
@@ -9274,9 +9272,7 @@ EOF
92749272
cat>>$CONFIG_STATUS<<EOF
92759273
92769274
CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
9277-
src/GNUmakefile
92789275
src/Makefile.global
9279-
src/backend/port/Makefile
92809276
"}
92819277
EOF
92829278
cat>>$CONFIG_STATUS<<\EOF

‎configure.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,9 +1247,7 @@ fi
12471247
AC_OUTPUT(
12481248
[
12491249
GNUmakefile
1250-
src/GNUmakefile
12511250
src/Makefile.global
1252-
src/backend/port/Makefile
12531251
],
12541252
[
12551253
# Update timestamp for pg_config.h (see Makefile.global)

‎src/GNUmakefile.in‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/Makefile‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,43 @@
1-
# The PostgreSQL make files exploit features of GNU make that other
2-
# makes do not have. Because it is a common mistake for users to try
3-
# to build Postgres with a different make, we have this make file
4-
# that, as a service, will look for a GNU make and invoke it, or show
5-
# an error message if none could be found.
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile for src
4+
#
5+
# Copyright (c) 1994, Regents of the University of California
6+
#
7+
# $Header: /cvsroot/pgsql/src/Makefile,v 1.24 2002/03/13 00:05:02 petere Exp $
8+
#
9+
#-------------------------------------------------------------------------
610

7-
# If the user were using GNU make now, this file would not get used
8-
# because GNU make uses a make file named "GNUmakefile" in preference
9-
# to "Makefile" if it exists. PostgreSQL is shipped with a
10-
# "GNUmakefile". If the user hasn't run the configure script yet, the
11-
# GNUmakefile won't exist yet, so we catch that case as well.
11+
subdir = src
12+
top_builddir = ..
13+
include Makefile.global
1214

1315

14-
allcheckinstallinstalldirsinstall-all-headersinstallcheckuninstalldepdependcleandistcleanmaintainer-clean:
15-
@if [!-f GNUmakefile ];then\
16-
echo"You need to run the 'configure' program first. See the file";\
17-
echo"'INSTALL' for installation instructions.";\
18-
false;\
19-
fi
20-
@IFS=':';\
21-
fordirin$$PATH;do \
22-
forprogin gmake gnumake make;do \
23-
if [-f$$dir/$$prog ]&& ($$dir/$$prog -f /dev/null --version2>/dev/null| grep GNU>/dev/null2>&1 );then \
24-
GMAKE=$$dir/$$prog;\
25-
break 2;\
26-
fi;\
27-
done;\
28-
done;\
29-
\
30-
if [ x"$${GMAKE+set}"= xset ];then \
31-
echo"Using GNU make found at$${GMAKE}";\
32-
$${GMAKE}$@;\
33-
else\
34-
echo"You must use GNU make to build PostgreSQL.";\
35-
false;\
36-
fi
16+
allinstallinstalldirsuninstalldepdependdistprep:
17+
$(MAKE) -C backend$@
18+
$(MAKE) -C include$@
19+
$(MAKE) -C interfaces$@
20+
$(MAKE) -C bin$@
21+
$(MAKE) -C pl$@
22+
23+
install-all-headers:
24+
$(MAKE) -C include$@
25+
26+
clean:
27+
$(MAKE) -C backend$@
28+
$(MAKE) -C include$@
29+
$(MAKE) -C interfaces$@
30+
$(MAKE) -C bin$@
31+
$(MAKE) -C pl$@
32+
$(MAKE) -C utils$@
33+
$(MAKE) -Ctest$@
34+
35+
distcleanmaintainer-clean:
36+
-$(MAKE) -C utils$@
37+
-$(MAKE) -C backend$@
38+
-$(MAKE) -C include$@
39+
-$(MAKE) -C interfaces$@
40+
-$(MAKE) -C bin$@
41+
-$(MAKE) -C pl$@
42+
-$(MAKE) -Ctest$@
43+
rm -f Makefile.port Makefile.global

‎src/Makefile.global.in‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.142 2002/03/05 17:55:22 momjian Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.143 2002/03/13 00:05:02 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -325,12 +325,21 @@ endif
325325
#
326326
# substitute implementations of the C library
327327

328-
INET_ATON = @INET_ATON@
329-
STRERROR = @STRERROR@
330-
SNPRINTF = @SNPRINTF@
331-
STRDUP = @STRDUP@
332-
MEMCMP = @MEMCMP@
333-
STRTOUL = @STRTOUL@
328+
GETHOSTNAME = @GETHOSTNAME@
329+
GETRUSAGE = @GETRUSAGE@
330+
INET_ATON = @INET_ATON@
331+
ISINF = @ISINF@
332+
MEMCMP = @MEMCMP@
333+
MISSING_RANDOM = @MISSING_RANDOM@
334+
SNPRINTF = @SNPRINTF@
335+
SRANDOM = @SRANDOM@
336+
STRCASECMP = @STRCASECMP@
337+
STRDUP = @STRDUP@
338+
STRERROR = @STRERROR@
339+
STRTOL = @STRTOL@
340+
STRTOUL = @STRTOUL@
341+
342+
TAS = @TAS@
334343

335344

336345
##########################################################################

‎src/backend/Makefile‎

Lines changed: 2 additions & 2 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.76 2002/02/18 06:03:22 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.77 2002/03/13 00:05:05 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -194,7 +194,7 @@ ifeq ($(enable_nls), yes)
194194
endif
195195

196196
distclean: clean
197-
rm -f port/Makefile port/tas.s port/dynloader.c
197+
rm -f port/tas.s port/dynloader.c
198198

199199
maintainer-clean: distclean
200200
rm -f$(srcdir)/bootstrap/bootparse.c\

‎src/backend/port/Makefile.in‎renamed to ‎src/backend/port/Makefile‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@
1313
# be converted to Method 2.
1414
#
1515
# IDENTIFICATION
16-
# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.32 2002/03/04 17:43:32 tgl Exp $
16+
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.11 2002/03/13 00:05:06 petere Exp $
1717
#
1818
#-------------------------------------------------------------------------
1919

2020
subdir = src/backend/port
2121
top_builddir = ../../..
2222
include$(top_builddir)/src/Makefile.global
2323

24-
# Note: invoking a macro from Makefile.global is better than substituting
25-
# here; ideally this file should not need to be generated by configure
26-
# at all.
27-
OBJS = dynloader.o$(INET_ATON)$(STRERROR) @MISSING_RANDOM@ @SRANDOM@
28-
OBJS+= @GETHOSTNAME@ @GETRUSAGE@$(MEMCMP) @STRCASECMP@ @TAS@ @ISINF@
29-
OBJS+= @STRTOL@$(STRTOUL)$(SNPRINTF)
24+
OBJS = dynloader.o
25+
26+
OBJS +=$(GETHOSTNAME)$(GETRUSAGE)$(INET_ATON)$(ISINF)$(MEMCMP)\
27+
$(MISSING_RANDOM)$(SNPRINTF)$(SRANDOM)$(STRCASECMP)$(STRERROR)\
28+
$(STRTOL)$(STRTOUL)$(SNPRINTF)
29+
30+
OBJS +=$(TAS)
31+
3032
ifdefSTRDUP
3133
OBJS +=$(top_builddir)/src/utils/strdup.o
3234
endif
@@ -43,7 +45,7 @@ endif
4345
all: SUBSYS.o
4446

4547
SUBSYS.o:$(OBJS)
46-
$(LD)$(LDREL)$(LDOUT)SUBSYS.o$(OBJS)
48+
$(LD)$(LDREL)$(LDOUT)$@$^
4749

4850
$(top_builddir)/src/utils/strdup.o:
4951
$(MAKE) -C$(top_builddir)/src/utils strdup.o
@@ -71,10 +73,3 @@ distclean clean:
7173
$(MAKE) -C beos clean
7274
$(MAKE) -C darwin clean
7375
$(MAKE) -C qnx4 clean
74-
75-
dependdep:
76-
$(CC) -MM$(CFLAGS)*.c>depend
77-
78-
ifeq (depend,$(wildcard depend))
79-
include depend
80-
endif

0 commit comments

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