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

Commitb20766c

Browse files
author
Bryan Henderson
committed
Eliminate MKDIR, srcdir, objdir. Centralize setting of LIBPQDIR.
1 parentfdc1cf2 commitb20766c

File tree

12 files changed

+35
-74
lines changed

12 files changed

+35
-74
lines changed

‎src/Makefile‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile,v 1.10 1996/11/11 13:51:20 bryanh Exp $
11-
#
12-
# NOTES
13-
#objdir- location of the objects and generated files (eg. obj)
10+
# $Header: /cvsroot/pgsql/src/Makefile,v 1.11 1996/11/13 10:34:58 bryanh Exp $
1411
#
1512
#-------------------------------------------------------------------------
1613

17-
MKDIR=./mk
18-
-include$(MKDIR)/../Makefile.global
14+
SRCDIR= .
15+
include Makefile.global
1916

2017
FIND = find
2118
# assuming gnu tar and split here
@@ -41,7 +38,7 @@ ifeq ($(USE_TCL), true)
4138
$(MAKE) -C libpgtcl $@
4239
endif
4340
$(MAKE) -C bin $@
44-
ifneq ($(wildcard$(MKDIR)/../../doc), )
41+
ifneq ($(wildcard ../doc), )
4542
$(MAKE) -C ../doc $@
4643
endif
4744
@if test $@. = all. -o $@. = .; then \

‎src/Makefile.global‎

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.64 1996/11/1308:36:31 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.65 1996/11/1310:35:00 bryanh Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -68,28 +68,13 @@ PORTNAME= UNDEFINED
6868
# library), set LINUX_ELF to null in Makefile.custom.
6969
LINUX_ELF= 1
7070

71-
# SRCDIR specifies where the source files are. It should be defined before
72-
# we are included, but for transition purposes, we put this default here.
73-
ifdef SRCDIR
74-
MKDIR:= $(SRCDIR)/mk
75-
else
76-
SRCDIR:= $(MKDIR)/..
77-
endif
78-
7971
LIBPQDIR:= $(SRCDIR)/libpq
8072

8173
# For convenience, POSTGRESDIR is where DATADIR, BINDIR, and LIBDIR
8274
# and other target destinations are rooted. Of course, each of these is
8375
# changable separately.
8476
POSTGRESDIR= /usr/local/pgsql
8577

86-
# POSTGRESLOGIN is the login name of the user who gets special
87-
# privileges within the database. By default it is "postgres", but
88-
# you can change it to any existing login name (such as your own
89-
# login if you are compiling a private version or don't have root
90-
# access).
91-
POSTGRESLOGIN= postgres
92-
9378
# DATADIR specifies where the postmaster expects to find its database.
9479
# This may be overridden by command line options or the PGDATA environment
9580
# variable.
@@ -268,17 +253,15 @@ DASH_N= -n
268253
BACKSLASH_C=
269254

270255

271-
objdir= obj
272-
273256
##############################################################################
274257
#
275258
# Customization.
276259
#
277260
# This includes your local customizations if Makefile.custom exists
278261
# in the source directory. This file doesn't exist in the original
279262
# distribution so that it doesn't get overwritten when you upgrade.
280-
ifneq ($(wildcard $(MKDIR)/../Makefile.custom), )
281-
include $(MKDIR)/../Makefile.custom
263+
ifneq ($(wildcard $(SRCDIR/Makefile.custom), )
264+
include $(SRCDIR)/Makefile.custom
282265
endif
283266

284267
#############################################################################
@@ -304,10 +287,9 @@ endif
304287
# HISTORY: Before October 1996, this file included the following line:
305288
# -include $(MKDIR)/port/postgres.mk.$(PORTNAME)
306289
# Now, we instead have all the former contents of those .mk files inline
307-
# with ifeq ($(PORTNAME) ...). This makes it a little bit easier to use
308-
# Makefile.global because you don't have to set MKDIR too. It also makes
309-
# it easier to read the make files. Finally, it should help with
310-
# migration to autoconf. - Bryan
290+
# with ifeq ($(PORTNAME) ...). This makes it easier to read the make
291+
# files and to make certain updates. It should also help with the migration
292+
# to autoconf. -Bryan
311293

312294
# Since there are no longer separate files for each platform, much of the
313295
# commonality among the platforms ought to be factored out of the following.
@@ -548,7 +530,7 @@ INSTALL= /usr/ucb/install
548530
# everything to compile. :-/
549531
#
550532
# The extra -I flag is to scoop up extra BSD-emulating headers.
551-
CFLAGS_BE+= -DSYSV_DIRENT -I$(POSTGRESDIR)/src/backend/port/sparc_solaris
533+
CFLAGS_BE+= -DSYSV_DIRENT -I$(SRCDIR)/backend/port/sparc_solaris
552534
LDADD_BE+= -lsocket -lnsl
553535

554536
LD_ADD+= $(LDADD_BE)
@@ -715,7 +697,7 @@ INSTALL= /home/tools/bin/install
715697
# everything to compile. :-/
716698
#
717699
# The extra -I flag is to scoop up extra BSD-emulating headers.
718-
CFLAGS_BE+= -DSYSV_DIRENT -I$(POSTGRESDIR)/src/backend/port/svr4
700+
CFLAGS_BE+= -DSYSV_DIRENT -I$(SRCDIR)/backend/port/svr4
719701
LDADD_BE+= -lsocket -lnsl -lc /usr/ucblib/libucb.a
720702

721703
LD_ADD+= $(LDADD_BE)
@@ -755,15 +737,6 @@ endif
755737

756738

757739

758-
##############################################################################
759-
#
760-
# Miscellaneous configuration
761-
#
762-
763-
srcdir= $(SRCDIR)
764-
includedir= $(HEADERDIR)
765-
766-
767740
# This goes here so that customization in Makefile.custom is effective
768741
##############################################################################
769742
#

‎src/bin/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.5 1996/11/11 13:39:09 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.6 1996/11/13 10:35:20 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR=..
15-
include$(SRCDIR)/Makefile.global
15+
include../Makefile.global
1616

1717
.DEFAULTall:
1818
#

‎src/bin/psql/Makefile‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,53 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.12 1996/11/12 06:11:52 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.13 1996/11/13 10:35:26 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
SRCDIR = ../..
15-
LIBPQDIR =$(SRCDIR)/libpq
14+
SRCDIR= ../..
1615
include ../../Makefile.global
1716

18-
INCLUDE_OPT:=\
17+
INCLUDE_OPT:=\
1918
-I$(LIBPQDIR)\
20-
-I$(SRCDIR)/include
19+
-I../../include
2120

22-
CFLAGS+=$(INCLUDE_OPT)
21+
CFLAGS+=$(INCLUDE_OPT)
2322
#
2423
#USE_READLINE is set in Makefile.global
2524
#
2625

2726
ifeq ($(USE_READLINE), true)
28-
CFLAGS+=$(READLINE_INC)$(HISTORY_INC)
27+
CFLAGS+=$(READLINE_INC)$(HISTORY_INC)
2928

3029
LIBCURSES=-lcurses
31-
LD_ADD+=$(READLINE_LIB)$(HISTORY_LIB)$(LIBCURSES)
30+
LD_ADD+=$(READLINE_LIB)$(HISTORY_LIB)$(LIBCURSES)
3231

3332
ifeq ($(PORTNAME), ultrix4)
34-
LD_ADD+= -ltermcap
33+
LD_ADD+= -ltermcap
3534
else
3635
ifeq ($(PORTNAME), sparc)
37-
LD_ADD+= -ltermcap
36+
LD_ADD+= -ltermcap
3837
else
3938
ifeq ($(PORTNAME), linux)
40-
LD_ADD+= -ltermcap
39+
LD_ADD+= -ltermcap
4140
else
4241
ifeq ($(PORTNAME), next)
43-
LD_ADD+= -ltermcap
42+
LD_ADD+= -ltermcap
4443
else
4544
ifeq ($(PORTNAME), bsdi)
46-
LD_ADD+= -ltermcap
45+
LD_ADD+= -ltermcap
4746
else
4847
ifeq ($(PORTNAME), BSD44_derived)
49-
LD_ADD+= -ltermcap
48+
LD_ADD+= -ltermcap
5049
endif
5150
endif
5251
endif
5352
endif
5453
endif
5554
endif
5655
else
57-
CFLAGS+= -DNOREADLINE
56+
CFLAGS+= -DNOREADLINE
5857
endif
5958

6059
OBJS= psql.o stringutils.o

‎src/interfaces/libpgtcl/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.5 1996/11/12 11:42:09 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.6 1996/11/13 10:35:31 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
15-
LIBPQDIR=$(SRCDIR)/libpq
1615
include ../Makefile.global
1716

1817
INCLUDE_OPT=\
@@ -58,4 +57,4 @@ install-libpgtcl: libpgtcl.a
5857

5958
.PHONY: clean
6059
clean:
61-
rm -f$(OBJS)
60+
rm -f$(OBJS)

‎src/interfaces/libpq++/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.2 1996/11/12 11:42:24 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.3 1996/11/13 10:35:39 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
15-
LIBPQDIR=$(SRCDIR)/libpq
1615
include ../Makefile.global
1716

1817
CXXFLAGS=$(CFLAGS)
@@ -63,4 +62,4 @@ doc:
6362

6463
clean:
6564
rm libpq++.a$(OBJS)
66-
$(MAKE) -C examples clean
65+
$(MAKE) -C examples clean

‎src/interfaces/libpq++/examples/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44

55
SRCDIR= ../..
6-
LIBPQDIR=$(SRCDIR)/libpq
76
include ../../Makefile.global
87

98
CXXFLAGS=$(CFLAGS)

‎src/test/bench/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.2 1996/11/12 11:42:49 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.3 1996/11/13 10:35:59 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
15-
LIBPQDIR=$(SRCDIR)/libpq
1615
include ../../Makefile.global
1716

1817
CREATEFILES= create.sql bench.sql

‎src/test/examples/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44

55
SRCDIR= ../..
6-
LIBPQDIR=$(SRCDIR)/libpq
76
include ../../Makefile.global
87

98
CFLAGS+= -I$(LIBPQDIR)

‎src/test/regress/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.8 1996/11/12 11:43:05 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.9 1996/11/13 10:36:17 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
15-
LIBPQDIR=$(SRCDIR)/libpq
1615
include ../../Makefile.global
1716

1817
CFLAGS+= -I$(LIBPQDIR) -I../../include

0 commit comments

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