aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/bootstrap/Makefile23
-rw-r--r--src/backend/parser/Makefile23
-rw-r--r--src/backend/tcop/Makefile21
3 files changed, 44 insertions, 23 deletions
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index beb2756c94e..6702bce1b61 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.3 1996/11/09 06:17:44 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.4 1996/11/14 07:33:20 bryanh Exp $
#
#
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -18,18 +18,25 @@
#
#-------------------------------------------------------------------------
-SRCDIR = ../..
+SRCDIR= ../..
include ../../Makefile.global
-INCLUDE_OPT = -I.. \
- -I../port/$(PORTNAME) \
- -I../../include
+INCLUDE_OPT= -I.. \
+ -I../port/$(PORTNAME) \
+ -I../../include
-CFLAGS += $(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT)
-BOOTYACCS = bootstrap_tokens.h bootparse.c
+ifeq ($(CC), gcc)
+# Until we figure out how to get rid of the warnings in this directory,
+# we must turn off any -Werror that is in CFLAGS now. These options only
+# exist for the gcc compiler.
+CFLAGS+= -Wno-error
+endif
+
+BOOTYACCS= bootstrap_tokens.h bootparse.c
-OBJS = bootparse.o bootscanner.o bootstrap.o
+OBJS= bootparse.o bootscanner.o bootstrap.o
all: SUBSYS.o
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index 63b01a5418f..2c9d6616c7a 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -4,21 +4,28 @@
# Makefile for parser
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.3 1996/11/09 06:18:34 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.4 1996/11/14 07:33:30 bryanh Exp $
#
#-------------------------------------------------------------------------
-SRCDIR = ../..
+SRCDIR= ../..
include ../../Makefile.global
-INCLUDE_OPT = -I.. \
- -I../port/$(PORTNAME) \
- -I../../include
+INCLUDE_OPT= -I.. \
+ -I../port/$(PORTNAME) \
+ -I../../include
-CFLAGS+=$(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT)
-OBJS = analyze.o catalog_utils.o dbcommands.o gram.o \
- keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o
+ifeq ($(CC), gcc)
+# Until we figure out how to get rid of the warnings in this directory,
+# we must turn off any -Werror that is in CFLAGS now. These options only
+# exist for the gcc compiler.
+CFLAGS+= -Wno-error
+endif
+
+OBJS= analyze.o catalog_utils.o dbcommands.o gram.o \
+ keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o
all: SUBSYS.o
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index b4fcb90022f..719eaa2af2e 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,20 +4,27 @@
# Makefile for tcop
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.6 1996/11/10 04:09:51 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.7 1996/11/14 07:33:34 bryanh Exp $
#
#-------------------------------------------------------------------------
-SRCDIR = ../..
+SRCDIR= ../..
include ../../Makefile.global
-INCLUDE_OPT = -I.. \
- -I../port/$(PORTNAME) \
- -I../../include
+INCLUDE_OPT= -I.. \
+ -I../port/$(PORTNAME) \
+ -I../../include
-CFLAGS+=$(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT)
-OBJS = aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
+ifeq ($(CC), gcc)
+# Until we figure out how to get rid of the warnings in this directory,
+# we must turn off any -Werror that is in CFLAGS now. These options only
+# exist for the gcc compiler.
+CFLAGS+= -Wno-error
+endif
+
+OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
all: SUBSYS.o