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

Commit a0990e1

Browse files
bmomjianbmomjian
committed
Makefile cleanup after reorganization
1 parent 1d0e308 commit a0990e1

File tree

45 files changed

+94
-106
lines changed

Some content is hidden

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

45 files changed

+94
-106
lines changed

‎src/backend/access/heap/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for access/heap
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.2 1996/10/31 08:28:50 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.3 1996/11/09 06:17:34 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/access/transam/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for access/transam
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.2 1996/11/03 09:07:03 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.3 1996/11/09 06:17:38 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/bootstrap/Makefile

Lines changed: 1 addition & 2 deletions
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.2 1996/11/08 05:55:46 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.3 1996/11/09 06:17:44 momjian Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -23,7 +23,6 @@ include ../../Makefile.global
2323

2424
INCLUDE_OPT = -I.. \
2525
-I../port/$(PORTNAME) \
26-
-I../include \
2726
-I../../include
2827

2928
CFLAGS += $(INCLUDE_OPT) -Wno-error

‎src/backend/lib/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for lib (miscellaneous stuff)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.2 1996/10/31 10:26:26 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.3 1996/11/09 06:17:54 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/main/Makefile

Lines changed: 1 addition & 2 deletions
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.1 1996/10/27 09:47:59 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.2 1996/11/09 06:18:04 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I.. \
1515
-I../port/$(PORTNAME) \
16-
-I../include \
1716
-I../../include
1817

1918
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/optimizer/path/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for optimizer/path
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.2 1996/10/31 10:58:58 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.3 1996/11/09 06:18:10 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/optimizer/plan/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for optimizer/plan
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.2 1996/10/31 10:59:05 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.3 1996/11/09 06:18:17 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/optimizer/prep/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for optimizer/prep
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.2 1996/10/31 10:59:23 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.3 1996/11/09 06:18:23 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/parser/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for parser
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.2 1996/11/08 05:57:18 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.3 1996/11/09 06:18:34 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I.. \
1515
-I../port/$(PORTNAME) \
16-
-I../include \
1716
-I../../include
1817

1918
CFLAGS+=$(INCLUDE_OPT) -Wno-error

‎src/backend/port/BSD44_derived/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/BSD44_derived
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/BSD44_derived/Attic/Makefile,v 1.1 1996/10/27 09:49:20 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/BSD44_derived/Attic/Makefile,v 1.2 1996/11/09 06:18:40 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/aix/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/aix
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/aix/Attic/Makefile,v 1.1 1996/10/27 09:49:27 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/aix/Attic/Makefile,v 1.2 1996/11/09 06:18:48 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/alpha/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/alpha
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.1 1996/10/27 09:49:37 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.2 1996/11/09 06:18:57 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/bsdi/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/bsdi
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.3 1996/11/01 03:35:54 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.4 1996/11/09 06:19:06 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/dgux/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/dgux
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.1 1996/10/27 09:49:57 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.2 1996/11/09 06:19:14 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/hpux/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/hpux
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.1 1996/10/27 09:50:12 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.2 1996/11/09 06:19:21 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/i386_solaris/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/i386_solaris
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.1 1996/10/27 09:50:17 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.2 1996/11/09 06:19:27 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/irix5/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/irix5
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.1 1996/10/27 09:50:24 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.2 1996/11/09 06:19:36 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/linux/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/linux
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.1 1996/10/27 09:50:31 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.2 1996/11/09 06:19:51 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/sparc/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/sparc
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/sparc/Attic/Makefile,v 1.1 1996/10/27 09:50:43 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/sparc/Attic/Makefile,v 1.2 1996/11/09 06:20:07 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/sparc_solaris/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/sparc_solaris
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.1 1996/10/27 09:50:50 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.2 1996/11/09 06:20:17 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/svr4/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/svr4
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/svr4/Attic/Makefile,v 1.1 1996/10/27 09:50:57 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/svr4/Attic/Makefile,v 1.2 1996/11/09 06:20:26 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/port/ultrix4/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for port/ultrix
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.1 1996/10/27 09:51:05 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.2 1996/11/09 06:20:36 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

1414
INCLUDE_OPT = -I../.. \
15-
-I../../include \
1615
-I../../../include
1716

1817
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/postmaster/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for postmaster
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.2 1996/11/03 04:48:27 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.3 1996/11/09 06:20:48 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

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

1718
CFLAGS+=$(INCLUDE_OPT)

0 commit comments

Comments
 (0)