summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc G. Fournier1997-12-17 04:59:16 +0000
committerMarc G. Fournier1997-12-17 04:59:16 +0000
commit542d4e528d9622b2f0d0f9444fb963a9c6b1c209 (patch)
treecf85e0a52a8d0e75c70c5b93c6321202da292b5d
parent9ef6b32c4711f16b93cd51ce4bcf48c06a53f729 (diff)
First pass through, of many to come, towards making the whole source
tree "non-PORTNAME" dependent. Technically, anything that is PORTNAME dependent should be able to be derived at compile time, through configure or through gcc
Diffstat
-rw-r--r--src/backend/Makefile14
-rw-r--r--src/backend/bootstrap/Makefile10
-rw-r--r--src/backend/catalog/Makefile10
-rw-r--r--src/backend/executor/Makefile10
-rw-r--r--src/backend/lib/Makefile10
-rw-r--r--src/backend/libpq/Makefile10
-rw-r--r--src/backend/main/Makefile10
-rw-r--r--src/backend/main/main.c4
-rw-r--r--src/backend/nodes/Makefile10
9 files changed, 57 insertions, 31 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 0fa6123b538..ef80cebcd5a 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.27 1997/11/13 03:22:10 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.28 1997/12/17 04:58:19 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -60,7 +60,11 @@ postgres: $(OBJS) ../utils/version.o
$(OBJS): $(DIRS:%=%.dir)
$(DIRS:%=%.dir):
+ifdef PORTNAME
$(MAKE) -C $(subst .dir,,$@) all PORTNAME=$(PORTNAME)
+else
+ $(MAKE) -C $(subst .dir,,$@) all
+endif
../utils/version.o:
$(MAKE) -C ../utils version.o
@@ -96,10 +100,18 @@ clean:
rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \
global1.bki.source local1_template1.bki.source \
global1.description local1_template1.description
+ifdef PORTNAME
for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done
+else
+ for i in $(DIRS); do $(MAKE) -C $$i clean; done
+endif
.DEFAULT:
+ifdef PORTNAME
for i in $(DIRS); do $(MAKE) -C $$i $@ PORTNAME=$(PORTNAME); done
+else
+ for i in $(DIRS); do $(MAKE) -C $$i $@; done
+endif
#############################################################################
#
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 81abfb749a4..ec71797ee12 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -4,7 +4,7 @@
# Makefile for the bootstrap module
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.10 1997/06/11 01:11:55 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.11 1997/12/17 04:58:21 scrappy Exp $
#
#
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -21,9 +21,11 @@
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/catalog/Makefile b/src/backend/catalog/Makefile
index 09651f60827..f393bfde2c9 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -4,16 +4,18 @@
# Makefile for catalog
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.5 1997/11/15 20:57:02 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.6 1997/12/17 04:58:25 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/executor/Makefile b/src/backend/executor/Makefile
index fda9a03fe74..bedf2e5189a 100644
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@@ -4,16 +4,18 @@
# Makefile for executor
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.3 1997/08/30 10:28:47 vadim Exp $
+# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.4 1997/12/17 04:58:33 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/lib/Makefile b/src/backend/lib/Makefile
index f1dfa4834b5..006a0a3c56f 100644
--- a/src/backend/lib/Makefile
+++ b/src/backend/lib/Makefile
@@ -4,16 +4,18 @@
# Makefile for lib (miscellaneous stuff)
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.7 1997/01/14 02:35:34 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.8 1997/12/17 04:58:40 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/libpq/Makefile b/src/backend/libpq/Makefile
index ed43bdd1352..df3f015f034 100644
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,16 +4,18 @@
# Makefile for libpq subsystem (backend half of libpq interface)
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.8 1997/12/04 00:26:47 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.9 1997/12/17 04:58:58 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/main/Makefile b/src/backend/main/Makefile
index 093296511d4..4fb652c0580 100644
--- a/src/backend/main/Makefile
+++ b/src/backend/main/Makefile
@@ -4,16 +4,18 @@
# Makefile for main
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.2 1996/11/09 06:18:04 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.3 1997/12/17 04:59:05 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/main/main.c b/src/backend/main/main.c
index 2670f2c6ee7..969519c050f 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.9 1997/09/08 02:23:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.10 1997/12/17 04:59:10 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,7 @@
#include "miscadmin.h"
#include "bootstrap/bootstrap.h"/* for BootstrapMain() */
#include "tcop/tcopprot.h" /* for PostgresMain() */
-#include "port-protos.h" /* for init_address_fixup() */
+/* #include "port-protos.h" */ /* for init_address_fixup() */
#define NOROOTEXEC "\
\n\"root\" execution of the PostgreSQL backend is not permitted\n\n\
diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile
index 6f75fb14959..fb682d0bd7d 100644
--- a/src/backend/nodes/Makefile
+++ b/src/backend/nodes/Makefile
@@ -4,16 +4,18 @@
# Makefile for nodes
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.3 1996/11/06 08:54:16 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.4 1997/12/17 04:59:16 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)
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-14 05:55:00 +0000