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

Commite2d9501

Browse files
committed
Clean up the Makefiles
Essentially, this cleans things up so that if PORTNAME isn't defined (I'm working on getting rid of it for FreeBSD, at least, to see if its possible) none of the PORTNAME related stuff gets passed around.Had a little bit of -I related redundancy as well
1 parentceabf8c commite2d9501

File tree

8 files changed

+55
-39
lines changed

8 files changed

+55
-39
lines changed

‎src/backend/access/common/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.6 1996/11/05 07:42:39 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.7 1997/12/17 04:30:45 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
15+
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
1719

1820
CFLAGS+=$(INCLUDE_OPT)
1921

‎src/backend/access/gist/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/gist
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.3 1996/11/05 08:18:42 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.4 1997/12/17 04:30:47 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = gist.o gistget.o gistscan.o giststrat.o
2123

‎src/backend/access/hash/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/hash
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.3 1996/11/05 09:40:16 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.4 1997/12/17 04:30:52 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o\
2123
hashsearch.o hashstrat.o hashutil.o

‎src/backend/access/heap/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/heap
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.3 1996/11/09 06:17:34 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.4 1997/12/17 04:31:00 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = heapam.o hio.o stats.o
2123

‎src/backend/access/index/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/index
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.3 1996/11/05 10:02:01 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.4 1997/12/17 04:31:11 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = genam.o indexam.o istrat.o
2123

‎src/backend/access/nbtree/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/nbtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.3 1996/11/05 10:35:27 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.4 1997/12/17 04:31:19 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o\
2123
nbtstrat.o nbtutils.o nbtsort.o

‎src/backend/access/rtree/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/rtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.3 1996/11/05 10:54:15 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.4 1997/12/17 04:31:24 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o
2123

‎src/backend/access/transam/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
# Makefile for access/transam
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.3 1996/11/09 06:17:38 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.4 1997/12/17 04:31:34 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../../include
14+
INCLUDE_OPT = -I../..
1715

18-
CFLAGS+=$(INCLUDE_OPT)
16+
ifdefPORTNAME
17+
INCLUDE_OPT += -I../../port/$(PORTNAME)
18+
endif
19+
20+
CFLAGS +=$(INCLUDE_OPT)
1921

2022
OBJS = transam.o transsup.o varsup.o xact.o xid.o
2123

0 commit comments

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