Commit6fb5115

committed

Get rid of inappropriate flags in CPPFLAGS override --- these break

non-gcc compilers, and they would never belong in CPPFLAGS anyway.

1 parent20f8480 commit6fb5115Copy full SHA for 6fb5115

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.1 2003/03/30 13:26:09 meskes Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.2 2003/04/08 17:08:15 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -16,7 +16,7 @@ NAME= ecpg_compat`
`16`	`16`	`SO_MAJOR_VERSION= 1`
`17`	`17`	`SO_MINOR_VERSION= 0.0`
`18`	`18`
`19`		`-overrideCPPFLAGS := -O1 -g -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils$(CPPFLAGS)`
	`19`	`+overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils$(CPPFLAGS)`
`20`	`20`
`21`	`21`	`OBJS= informix.o`
`22`	`22`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.1 2003/03/16 10:42:53 meskes Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.2 2003/04/08 17:09:01 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -16,7 +16,7 @@ NAME= ecpg`
`16`	`16`	`SO_MAJOR_VERSION= 3`
`17`	`17`	`SO_MINOR_VERSION= 4.2`
`18`	`18`
`19`		`-overrideCPPFLAGS := -g -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)$(CPPFLAGS)`
	`19`	`+overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)$(CPPFLAGS)`
`20`	`20`
`21`	`21`	`OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o\`
`22`	`22`	`connect.o misc.o`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.4 2003/03/30 11:48:18 meskes Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.5 2003/04/08 17:06:15 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -16,7 +16,7 @@ NAME= pgtypes`
`16`	`16`	`SO_MAJOR_VERSION= 1`
`17`	`17`	`SO_MINOR_VERSION= 0.0`
`18`	`18`
`19`		`-overrideCPPFLAGS := -O1 -g -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils$(CPPFLAGS)`
	`19`	`+overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils$(CPPFLAGS)`
`20`	`20`
`21`	`21`	`OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o`
`22`	`22`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/test/Makefile,v 1.35 2003/03/20 15:56:50 meskes Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/test/Makefile,v 1.36 2003/04/08 17:09:51 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = src/interfaces/ecpg/test`
`4`	`4`	`top_builddir = ../../../..`
`5`	`5`	`include$(top_builddir)/src/Makefile.global`
`6`	`6`
`7`		`-overrideCPPFLAGS := -I$(srcdir)/../include$(CPPFLAGS) -g`
	`7`	`+overrideCPPFLAGS := -I$(srcdir)/../include$(CPPFLAGS)`
`8`	`8`
`9`	`9`	`ECPG = ../preproc/ecpg -I$(srcdir)/../include`
`10`	`10`

Comments

(0)