Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6e337ee

Browse files
scrappyscrappy
committed
Major cleanout of PORTNAME variables from Makefiles...bound to screw up
some of the ports...
1 parent 10ff1ee commit 6e337ee

File tree

61 files changed

+78
-292
lines changed

Some content is hidden

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

61 files changed

+78
-292
lines changed

‎src/Makefile.global.in

+2-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.29 1997/12/19 21:29:28 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.30 1997/12/20 00:22:04 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -41,18 +41,9 @@
4141
# CONFIGURATION SECTION
4242
#
4343
# Following are settings pertaining to the postgres build and
44-
# installation. The most important one is obviously the name
44+
# installation.
4545
# of the port.
4646
#
47-
# Note that portname is defined here to be UNDEFINED to remind you
48-
# to change it in Makefile.custom.
49-
#
50-
# make sure that you have no whitespaces after the PORTNAME setting
51-
# or the makefiles can get confused
52-
#
53-
# This should no longer be appropriate...scrappy@postgresql.org
54-
#PORTNAME= @PORTNAME@
55-
5647
# Ignore LINUX_ELF if you're not using Linux. But if you are, and you're
5748
# compiling to a.out (which means you're using the dld dynamic loading
5849
# library), set LINUX_ELF to null in Makefile.custom.

‎src/backend/Makefile

+2-14
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.28 1997/12/17 04:58:19 scrappy Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.29 1997/12/20 00:22:06 scrappy Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -60,11 +60,7 @@ postgres: $(OBJS) ../utils/version.o
6060
$(OBJS): $(DIRS:%=%.dir)
6161

6262
$(DIRS:%=%.dir):
63-
ifdef PORTNAME
64-
$(MAKE) -C $(subst .dir,,$@) all PORTNAME=$(PORTNAME)
65-
else
6663
$(MAKE) -C $(subst .dir,,$@) all
67-
endif
6864

6965
../utils/version.o:
7066
$(MAKE) -C ../utils version.o
@@ -100,18 +96,10 @@ clean:
10096
rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \
10197
global1.bki.source local1_template1.bki.source \
10298
global1.description local1_template1.description
103-
ifdef PORTNAME
104-
for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done
105-
else
10699
for i in $(DIRS); do $(MAKE) -C $$i clean; done
107-
endif
108100

109101
.DEFAULT:
110-
ifdef PORTNAME
111-
for i in $(DIRS); do $(MAKE) -C $$i $@ PORTNAME=$(PORTNAME); done
112-
else
113102
for i in $(DIRS); do $(MAKE) -C $$i $@; done
114-
endif
115103

116104
#############################################################################
117105
#
@@ -173,7 +161,7 @@ quick: $(OBJS)
173161
IDFILE= ID
174162
.PHONY: $(IDFILE)
175163
$(IDFILE):
176-
./makeID $(PORTNAME)
164+
./makeID
177165

178166
#
179167
# Special rule to generate cpp'd version of a .c file. This is

‎src/backend/access/common/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.7 1997/12/17 04:30:45 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.8 1997/12/20 00:22:11 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \

‎src/backend/access/gist/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/gist
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.4 1997/12/17 04:30:47 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.5 1997/12/20 00:22:16 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = gist.o gistget.o gistscan.o giststrat.o

‎src/backend/access/hash/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/hash
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.4 1997/12/17 04:30:52 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.5 1997/12/20 00:22:31 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \

‎src/backend/access/heap/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/heap
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.4 1997/12/17 04:31:00 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.5 1997/12/20 00:22:39 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = heapam.o hio.o stats.o

‎src/backend/access/index/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/index
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.4 1997/12/17 04:31:11 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.5 1997/12/20 00:22:47 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = genam.o indexam.o istrat.o

‎src/backend/access/nbtree/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/nbtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.4 1997/12/17 04:31:19 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.5 1997/12/20 00:22:54 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \

‎src/backend/access/rtree/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/rtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.4 1997/12/17 04:31:24 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.5 1997/12/20 00:23:00 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o

‎src/backend/access/transam/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/transam
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.4 1997/12/17 04:31:34 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.5 1997/12/20 00:23:09 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
INCLUDE_OPT = -I../..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT += -I../../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS += $(INCLUDE_OPT)
2117

2218
OBJS = transam.o transsup.o varsup.o xact.o xid.o

‎src/backend/bootstrap/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.11 1997/12/17 04:58:21 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.12 1997/12/20 00:23:19 scrappy Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -23,10 +23,6 @@ include ../../Makefile.global
2323

2424
INCLUDE_OPT= -I..
2525

26-
ifdef PORTNAME
27-
INCLUDE_OPT+=-I../port/$(PORTNAME)
28-
endif
29-
3026
CFLAGS+= $(INCLUDE_OPT)
3127

3228
ifeq ($(CC), gcc)

‎src/backend/catalog/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.6 1997/12/17 04:58:25 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.7 1997/12/20 00:23:26 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = catalog.o heap.o index.o indexing.o \

‎src/backend/commands/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.9 1997/12/17 04:44:47 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.10 1997/12/20 00:23:32 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \

‎src/backend/executor/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for executor
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.4 1997/12/17 04:58:33 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.5 1997/12/20 00:23:37 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \

‎src/backend/lib/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for lib (miscellaneous stuff)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.8 1997/12/17 04:58:40 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.9 1997/12/20 00:23:48 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = bit.o fstack.o hasht.o lispsort.o qsort.o stringinfo.o dllist.o

‎src/backend/libpq/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for libpq subsystem (backend half of libpq interface)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.9 1997/12/17 04:58:58 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.10 1997/12/20 00:23:57 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
# kerberos flags

‎src/backend/main/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for main
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.3 1997/12/17 04:59:05 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.4 1997/12/20 00:24:03 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = main.o

‎src/backend/nodes/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for nodes
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.4 1997/12/17 04:59:16 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.5 1997/12/20 00:24:08 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..
1515

16-
ifdef PORTNAME
17-
INCLUDE_OPT+=-I../port/$(PORTNAME)
18-
endif
19-
2016
CFLAGS+=$(INCLUDE_OPT)
2117

2218
OBJS = nodeFuncs.o nodes.o list.o \

0 commit comments

Comments
 (0)