Readd -DFRONTEND to client makefiles because it still affects win32.h

bmomjian · bmomjian · commit b5ddfb4bd00c · 2004-10-04T18:05:55.000Z
defines.
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
@@ -5,15 +5,15 @@
 # Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.45 2004/10/04 13:43:55 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.46 2004/10/04 18:05:53 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/initdb
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS=	initdb.o
 
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998-2002, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.9 2004/10/04 13:43:55 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.10 2004/10/04 18:05:54 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS=   pg_config.o
 
-override CPPFLAGS := -I$(libpq_srcdir) -DVAL_CONFIGURE="\"$(configure_args)\"" $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -DVAL_CONFIGURE="\"$(configure_args)\"" $(CPPFLAGS)
 
 all: submake-libpgport pg_config
 
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
@@ -5,15 +5,15 @@
 # Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.16 2004/10/04 13:43:56 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.17 2004/10/04 18:05:54 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pg_ctl
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS=	pg_ctl.o
 
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
@@ -5,15 +5,15 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.53 2004/10/04 13:43:56 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.54 2004/10/04 18:05:54 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pg_dump
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS=	pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
 	pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.48 2004/10/04 13:43:57 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.49 2004/10/04 18:05:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
 
 REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
 
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
 
 OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
 	startup.o prompt.o variables.o large_obj.o print.o describe.o \
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.29 2004/10/04 13:43:57 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.30 2004/10/04 18:05:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
 
 PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb
 
-override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
 
 all: submake-libpq submake-backend $(PROGRAMS)
 

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`6`	`6`	`# Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.45 2004/10/04 13:43:55 momjian Exp $`
	`8`	`+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.46 2004/10/04 18:05:53 momjian Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`12`	`12`	`subdir = src/bin/initdb`
`13`	`13`	`top_builddir = ../../..`
`14`	`14`	`include $(top_builddir)/src/Makefile.global`
`15`	`15`
`16`		`-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)`
	`16`	`+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)`
`17`	`17`
`18`	`18`	`OBJS= initdb.o`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2002, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.9 2004/10/04 13:43:55 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.10 2004/10/04 18:05:54 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`OBJS= pg_config.o`
`16`	`16`
`17`		`-override CPPFLAGS := -I$(libpq_srcdir) -DVAL_CONFIGURE="\"$(configure_args)\"" $(CPPFLAGS)`
	`17`	`+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -DVAL_CONFIGURE="\"$(configure_args)\"" $(CPPFLAGS)`
`18`	`18`
`19`	`19`	`all: submake-libpgport pg_config`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`6`	`6`	`# Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.48 2004/10/04 13:43:57 momjian Exp $`
	`8`	`+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.49 2004/10/04 18:05:55 momjian Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global`
`15`	`15`
`16`	`16`	`REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref`
`17`	`17`
`18`		`-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND`
	`18`	`+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND`
`19`	`19`
`20`	`20`	`OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \`
`21`	`21`	`startup.o prompt.o variables.o large_obj.o print.o describe.o \`