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

Commit424f0ed

Browse files
committed
Fix relative path references so that make knowns which dependencies refer
to one another. Sort out builddir vs srcdir variable namings. Remove somenow obsoleted make variables.
1 parentd426662 commit424f0ed

File tree

102 files changed

+384
-453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+384
-453
lines changed

‎GNUmakefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.10 2000/08/20 15:55:15 petere Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.11 2000/08/31 16:08:58 petere Exp $
55
#
66

77
subdir =
88
top_builddir = .
9-
include src/Makefile.global
9+
include$(top_builddir)/src/Makefile.global
1010

1111
all:
1212
$(MAKE) -C doc all

‎contrib/findoidjoins/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.9 2000/08/31 16:08:59 petere Exp $
33
#
44

55
subdir = contrib/findoidjoins
66
top_builddir = ../..
77
include ../../src/Makefile.global
88

9-
CFLAGS+= -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
10-
LIBS+=$(LIBPGEASY)
9+
CFLAGS+= -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
10+
LIBS+=$(libpgeasy)
1111

1212
all: findoidjoins
1313

‎contrib/mSQL-interface/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.4 2000/07/09 13:13:17 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.5 2000/08/31 16:09:00 petere Exp $
33
#
44

55
subdir = contrib/mSQL-interface
66
top_builddir = ../..
7-
include../../src/Makefile.global
7+
include$(top_builddir)/src/Makefile.global
88

99
NAME:= mpgsql
1010
SO_MAJOR_VERSION := 0
1111
SO_MINOR_VERSION := 0
1212
OBJS:= mpgsql.o
1313

14-
CFLAGS+= -I$(LIBPQDIR)
14+
CFLAGS+= -I$(libpq_srcdir)
1515

1616
include$(top_srcdir)/src/Makefile.shlib
1717

‎contrib/odbc/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# ODBC extensions
22
# Thomas Lockhart 2000-04-03
33

4-
SRCDIR= ../../src
5-
6-
include$(SRCDIR)/Makefile.global
4+
subdir = contrib/odbc
5+
top_builddir = ../..
6+
include$(top_builddir)/src/Makefile.global
77

88
ifndefPGLIB
99
PGLIB= .

‎contrib/pg_dumplo/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.6 2000/08/31 16:09:05 petere Exp $
33
#
44

55
subdir = contrib/pg_dumplo
66
top_builddir = ../..
77
include ../../src/Makefile.global
88

99
OBJS= main.o lo_export.o lo_import.o utils.o
10-
CFLAGS += -I$(LIBPQDIR)
10+
CFLAGS += -I$(libpq_srcdir)
1111

1212
all: pg_dumplo
1313

14-
pg_dumplo:$(OBJS)$(LIBPQDIR)/libpq.a
15-
$(CC)$(CFLAGS) -o$@$(OBJS)$(LIBPQ)
14+
pg_dumplo:$(OBJS)$(libpq_builddir)/libpq.a
15+
$(CC)$(CFLAGS) -o$@$(OBJS)$(libpq)
1616

1717
install: all installdirs
1818
$(INSTALL_PROGRAM) pg_dumplo$(X)$(bindir)

‎contrib/pgbench/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.6 2000/08/31 16:09:09 petere Exp $
33
#
44

55
subdir = contrib/pgbench
66
top_builddir = ../..
77
include ../../src/Makefile.global
88

9-
CFLAGS+= -I$(LIBPQDIR)
10-
LIBS+=$(LIBPQ)
9+
CFLAGS+= -I$(libpq_srcdir)
10+
LIBS+=$(libpq)
1111

1212
all: pgbench
1313

‎contrib/vacuumlo/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.6 2000/07/09 13:13:55 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.7 2000/08/31 16:09:12 petere Exp $
33
#
44

55
subdir = contrib/vacuumlo
66
top_builddir = ../..
77
include ../../src/Makefile.global
88

9-
CPPFLAGS += -I$(LIBPQDIR)
10-
LIBS +=$(LIBPQ)
9+
CPPFLAGS += -I$(libpq_srcdir)
10+
LIBS +=$(libpq)
1111

1212
all: vacuumlo
1313

‎doc/src/Makefile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
# Postgres documentation makefile
2-
#Thomas Lockhart
2+
#$Header: /cvsroot/pgsql/doc/src/Makefile,v 1.11 2000/08/31 16:09:16 petere Exp $
33

4-
# Not yet generated from configure, so use relative path names for now...
5-
PGDOCS=..
6-
SRCDIR= ../../src
4+
subdir = doc/src
5+
top_builddir = ../..
6+
-include$(top_builddir)/src/Makefile.global
77

88
TAR= tar
99
ZIP= gzip
1010
TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
1111

12-
# Pick up Makefile.global from the source area
13-
# This is the only resource from the code source area and is optional
14-
15-
ifneq ($(wildcard$(SRCDIR)/Makefile.global), )
16-
include$(SRCDIR)/Makefile.global
17-
endif
18-
1912
SRC= admin postgres programmer tutorial user
2013

2114
TARGETS=$(SRC:%=%.tar.gz)
@@ -80,5 +73,4 @@ man.tar:
8073
# Compressed file
8174

8275
%.gz:%
83-
($(ZIP) -f $<)
84-
76+
$(GZIP) -f$<

‎doc/src/sgml/Makefile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.18 2000/08/26 13:08:14 petere Exp $
11+
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.19 2000/08/31 16:09:20 petere Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

15-
PGDOCS= ../..
16-
SRCDIR= ../../../src
15+
# Pick up Makefile.global from the source area
16+
# This is the only resource from the code source area and is optional.
17+
# Actually, we want this to get Makefile.custom - thomas 1998-03-01
18+
subdir = doc/src/sgml
19+
top_builddir = ../../..
20+
-include$(top_builddir)/src/Makefile.global
21+
1722

1823
# This is where the default stylesheets appear on my linux system.
1924
# Probably no need to change this; rather, put definitions
@@ -46,14 +51,6 @@ D2MSCRIPT= $(D2MDIR)/docbook2man-spec.pl
4651

4752
TAR= tar
4853

49-
# Pick up Makefile.global from the source area
50-
# This is the only resource from the code source area and is optional.
51-
# Actually, we want this to get Makefile.custom - thomas 1998-03-01
52-
53-
ifneq ($(wildcard$(SRCDIR)/Makefile.global),)
54-
include$(SRCDIR)/Makefile.global
55-
endif
56-
5754
# Hmm, made this optional but jade _really_ doesn't like them missing
5855
# - thomas 1998-03-01
5956
ifneq ($(HDSL), )

‎src/Makefile.global.in

Lines changed: 22 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,20 @@
1-
#----------------------------------------------------------------------------
2-
#
3-
# Makefile.global--
4-
# global configuration for the Makefiles
5-
#
6-
# Copyright (c) 1994, Regents of the University of California
7-
#
8-
#
9-
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.91 2000/08/28 11:53:14 petere Exp $
11-
#
12-
# NOTES
13-
# Essentially all Postgres make files include this file and use the
14-
# variables it sets.
15-
#
16-
# To override the default setting, create a Makefile.custom in this
17-
# directory and put your defines there. (Makefile.custom is included
18-
# near the end of this file). Sometimes, a variable gets set in
19-
# Makefile.global after Makefile.custom has been included, so you can't
20-
# simply set that variable in Makefile.custom. In those cases, there is
21-
# often another variable (like CUSTOM_COPT) that you can set in
22-
# Makefile.custom that influences the later setting of the true variable
23-
# of interest (like CFLAGS) by Makefile.global.
24-
#
25-
#
26-
# If you change any of these defines you probably have to
27-
# make clean; make
28-
# since no dependencies are created for these. (of course you can
29-
# be crafty and check what files really depend on them and just remake
30-
# those).
31-
#
32-
# Before including this file, you must set the SRCDIR variable to the
33-
# path of the top of the Postgres source tree (the directory that
34-
# contains this file).
1+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.92 2000/08/31 16:09:22 petere Exp $
2+
3+
#------------------------------------------------------------------------------
4+
# All PostgreSQL makefiles include this file and use the variables it sets,
5+
# which in turn are put here by the configure script. There is no need for
6+
# users to edit this file -- if it turns out to be necessary then that's a
7+
# bug.
358
#
36-
#-------------------------------------------------------------------------
9+
# A makefile that includes this file needs to set the variable `subdir' to
10+
# the relative path from the top to itself and `top_builddir' to the relative
11+
# path from itself to the top before including this file. (The "top" is the
12+
# parent directory of the directory this file is in.)
13+
#------------------------------------------------------------------------------
3714

3815
# PostgreSQL version number
3916
VERSION = @VERSION@
4017

41-
ifndef top_builddir
42-
top_builddir = $(SRCDIR)/..
43-
endif
44-
45-
ifndef SRCDIR
46-
SRCDIR = $(top_builddir)/src
47-
endif
48-
4918
# This should be changed once we have separate build dirs.
5019
top_srcdir = $(top_builddir)
5120

@@ -73,13 +42,14 @@ BSD_SHLIB= true
7342
# systems now. May be applicable to other systems to?
7443
ELF_SYSTEM= @ELF_SYS@
7544

76-
LIBPQDIR= $(SRCDIR)/interfaces/libpq
77-
LIBPGEASYDIR= $(SRCDIR)/interfaces/libpgeasy
78-
LIBPGTCLDIR= $(SRCDIR)/interfaces/libpgtcl
45+
libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
46+
libpq_builddir = $(top_builddir)/src/interfaces/libpq
47+
libpq = -L$(libpq_builddir) -lpq
48+
49+
libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
50+
libpgeasy_builddir = $(top_builddir/src/interfaces/libpgeasy
51+
libpgeasy = -L$(libpgeasy_builddir) -lpgeasy
7952

80-
LIBPQ= -L$(LIBPQDIR) -lpq
81-
LIBPGTCL= -L$(LIBPGTCLDIR) -lpgtcl
82-
LIBPGEASY= -L$(LIBPGEASYDIR) -lpgeasy
8353

8454
# installation directories
8555

@@ -99,16 +69,6 @@ docdir = @docdir@
9969

10070
odbcinst_ini_dir = @odbcinst_ini_dir@
10171

102-
# old variable names for installation directories
103-
104-
POSTGRESDIR= $(prefix)
105-
BINDIR= $(bindir)
106-
LIBDIR= $(libdir)
107-
TEMPLATEDIR= $(libdir)
108-
POSTMANDIR= $(mandir)
109-
POSTDOCDIR= $(docdir)
110-
HEADERDIR= $(includedir)
111-
11272

11373
##############################################################################
11474
#
@@ -117,10 +77,6 @@ HEADERDIR= $(includedir)
11777
# To disable a feature, comment out the entire definition
11878
# (that is, prepend '#', don't set it to "0" or "no").
11979

120-
# Comment out ENFORCE_ALIGNMENT if you do NOT want unaligned access to
121-
# multi-byte types to generate a bus error.
122-
ENFORCE_ALIGNMENT= true
123-
12480
# Comment out PROFILE to generate a profile version of the binaries
12581
#PROFILE= -p -non_shared
12682

@@ -156,7 +112,6 @@ MULTIBYTE=@MULTIBYTE@
156112
#
157113
# Installation.
158114
#
159-
# For many ports, INSTALL is overridden below.
160115
INSTALL= @INSTALL@
161116

162117
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,7 +135,7 @@ FLEX = @FLEX@
180135
FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS)
181136
AROPT= @AROPT@
182137
CPPFLAGS = @CPPFLAGS@
183-
CFLAGS = -I$(SRCDIR)/include $(CPPFLAGS) @CFLAGS@
138+
CFLAGS = -I$(top_srcdir)/src/include $(CPPFLAGS) @CFLAGS@
184139
CFLAGS_SL= @SHARED_LIB@
185140
LIBS= @LIBS@
186141
LDFLAGS= @LDFLAGS@ $(LIBS)
@@ -210,7 +165,7 @@ CPU= @CPU@
210165
HAVE_POSIX_SIGNALS= @HAVE_POSIX_SIGNALS@
211166
HPUXMATHLIB= @HPUXMATHLIB@
212167

213-
include $(SRCDIR)/Makefile.port
168+
include $(top_builddir)/src/Makefile.port
214169

215170
##############################################################################
216171
#
@@ -219,9 +174,7 @@ include $(SRCDIR)/Makefile.port
219174
# This includes your local customizations if Makefile.custom exists
220175
# in the source directory. This file doesn't exist in the original
221176
# distribution so that it doesn't get overwritten when you upgrade.
222-
ifneq ($(wildcard $(SRCDIR)/Makefile.custom), )
223-
include $(SRCDIR)/Makefile.custom
224-
endif
177+
-include $(top_srcdir)/src/Makefile.custom
225178

226179
# This goes here so that customization in Makefile.custom is effective
227180
##############################################################################

‎src/backend/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.63 2000/07/19 16:29:44 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.64 2000/08/31 16:09:23 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/backend
1212
top_builddir = ../..
13-
include../Makefile.global
13+
include$(top_builddir)/src/Makefile.global
1414

1515
DIRS := access bootstrap catalog parser commands executor lib libpq\
1616
main nodes optimizer port postmaster regex rewrite\

‎src/backend/access/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#
22
# Makefile for the access methods module
33
#
4-
# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.6 2000/07/13 16:06:42 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.7 2000/08/31 16:09:26 petere Exp $
55
#
66

77
subdir = src/backend/access
88
top_builddir = ../../..
9-
include../../Makefile.global
9+
include$(top_builddir)/src/Makefile.global
1010

1111
SUBDIRS := common gist hash heap index nbtree rtree transam
1212
SUBDIROBJS :=$(SUBDIRS:%=%/SUBSYS.o)

‎src/backend/access/common/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.18 2000/05/29 05:44:33 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.19 2000/08/31 16:09:30 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

11-
SRCDIR = ../../..
12-
include ../../../Makefile.global
11+
subdir = src/backend/access/common
12+
top_builddir = ../../../..
13+
include$(top_builddir)/src/Makefile.global
1314

1415
OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o\
1516
scankey.o tupdesc.o

0 commit comments

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