diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1997-12-19 02:09:10 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1997-12-19 02:09:10 +0000 |
| commit | 5379b84eff3ae207635d7ac9527b0a3f5eb272e7 (patch) | |
| tree | 84d6a71200ffe5edf43596bc2fbf3276737e086a /src/backend/optimizer | |
| parent | 30856a390457682db4f8577e9f5a7f8521839c6f (diff) | |
| download | postgresql-5379b84eff3ae207635d7ac9527b0a3f5eb272e7.tar.gz | |
More cleanups. I can now compile without PORTNAME being defined n
Makefile.global.
End result, if all goes well, should allow for much easier porting, since
there will no longer be a concept of a "port". Most, if not everything,
*should* be determined by configure, or by the compiler itself. Still
work to be done though :)
Diffstat (limited to 'src/backend/optimizer')
| -rw-r--r-- | src/backend/optimizer/geqo/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/optimizer/path/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/optimizer/prep/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/optimizer/util/Makefile | 10 |
5 files changed, 30 insertions, 20 deletions
diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 59aebdc1b0..35962b6612 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,16 +5,18 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Id: Makefile,v 1.7 1997/04/21 04:26:47 vadim Exp $ +# $Id: Makefile,v 1.8 1997/12/19 02:05:51 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index e91ee4bdc0..81ff2b5ead 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.3 1996/11/09 06:18:10 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.4 1997/12/19 02:05:59 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index d2fb050215..dbb6d62ea9 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.3 1996/11/09 06:18:17 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.4 1997/12/19 02:06:07 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 9c72133918..6d7bde5e8d 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.4 1997/11/21 18:10:39 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.5 1997/12/19 02:06:10 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index a927e4a019..271be3d7e0 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.3 1996/11/06 09:29:18 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.4 1997/12/19 02:06:17 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) |