From: Darren King <darrenk@insightdist.com>

This patch will...

1. Remove the "-Wall" option from the ecpg/lib and ecpg/preproc Makefile.

2. Remove the addition of $(SRCDIR)/include and-or $(SRCDIR)/backend from
   ecpg/lib, ecpg/preproc, libpq and utils Makefiles. Already in CFLAGS...

3. Set MK_NO_LORDER and RANLIB in Makefile.aix to avoid a couple of extra
   steps taken care of by the 'ld' command anyways.

src/backend/parser/gram.c

@@ -210,7 +210,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.2 1998/02/21 06:31:46 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.3 1998/02/27 02:40:36 scrappy Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -287,7 +287,7 @@ typedef union
 	char				chr;
 	char				*str;
 	bool				boolean;
-	bool*				pboolean;	/* for pg_user privileges */
+	bool*				pboolean;	/* for pg_shadow privileges */
 	List				*list;
 	Node				*node;
 	Value				*value;

src/backend/parser/parse.h

@@ -5,7 +5,7 @@ typedef union
 	char				chr;
 	char				*str;
 	bool				boolean;
-	bool	   *pboolean;		/* for pg_user privileges */
+	bool*				pboolean;	/* for pg_shadow privileges */
 	List				*list;
 	Node				*node;
 	Value				*value;
@@ -28,7 +28,6 @@ typedef union
 	RuleStmt			*rstmt;
 	InsertStmt			*astmt;
 } YYSTYPE;
-
 #define	ACTION	258
 #define	ADD	259
 #define	ALL	260

src/interfaces/ecpg/lib/Makefile.in

 SRCDIR= ../../..
 include $(SRCDIR)/Makefile.global
 
-PQ_INCLUDE=-I$(SRCDIR)/include -I$(SRCDIR)/interfaces/libpq
+PQ_INCLUDE=-I$(SRCDIR)/interfaces/libpq
 
 SO_MAJOR_VERSION=1
 SO_MINOR_VERSION=0
@@ -61,6 +61,6 @@ uninstall::
 libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)
 
 ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
-	$(CC) -Wall -I../include $(PQ_INCLUDE) -c ecpglib.c
+	$(CC) -I../include $(PQ_INCLUDE) -c ecpglib.c
 typename.o : typename.c ../include/ecpgtype.h
-	$(CC) -Wall -I../include $(PQ_INCLUDE) -c typename.c
+	$(CC) -I../include $(PQ_INCLUDE) -c typename.c

src/interfaces/ecpg/preproc/Makefile

@@ -5,7 +5,7 @@ MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCHLEVEL=0
 
-CFLAGS+=-I$(SRCDIR)/include -I../include -Wall -DMAJOR_VERSION=$(MAJOR_VERSION) -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)
+CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)
 
 all:: ecpg
 

src/interfaces/libpq/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.7 1998/02/24 03:09:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.8 1998/02/27 02:40:59 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,12 +17,9 @@ SO_MINOR_VERSION=1
 SRCDIR= ../..
 include $(SRCDIR)/Makefile.global
 
-# We need the backend directory here for its fmgr.h
-INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend
-
 PORTNAME=@PORTNAME@
 
-CFLAGS+= $(INCLUDE_OPT) -DFRONTEND
+CFLAGS+=-DFRONTEND
 
 ifdef KRBVERS
 CFLAGS+= $(KRBFLAGS)
@@ -175,7 +172,7 @@ install-shlib: $(shlib)
 	ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM *.c >depend
 
 .PHONY: clean
 clean:

src/makefiles/Makefile.aix

@@ -2,6 +2,9 @@
 # symbol names to tell them what to export/import.
 MAKE_EXPORTS= true
 
+RANLIB= touch
+MK_NO_LORDER= true
+
 EXPSUFF= .exp
 IMPSUFF= .imp
 

src/utils/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.3 1996/11/26 07:39:11 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.4 1998/02/27 02:41:21 scrappy Exp $
 #
 # About strdup:  Some systems have strdup in their standard library, others
 # don't.  Ones that don't will use this make file to compile the strdup.c
@@ -18,16 +18,12 @@
 SRCDIR = ..
 include ../Makefile.global
 
-INCLUDE_OPT = -I../include
-
-CFLAGS+=$(INCLUDE_OPT)
-
 all: version.o
 
 install:
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM *.c >depend
 
 clean: 
 	rm -f version.o