From c2ae46730098ead3df4261f502c576b84e6f7dfc Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sat, 26 Apr 1997 05:07:12 +0000 Subject: [PATCH] clean up the bin/*/Makefiles...up version.h to v6.1 instead of v6.0 Remove bin/Makefile.global since it wasn't actually *doing* anything that Makefile.global hadn't already done --- src/Makefile.global.in | 4 ++-- src/bin/Makefile | 5 ++--- src/bin/Makefile.global | 31 ------------------------------- src/bin/pg_dump/Makefile.in | 3 +-- src/bin/pg_id/Makefile | 3 +-- src/bin/pg_version/Makefile | 5 +++-- src/bin/pgtclsh/Makefile | 3 +-- src/bin/psql/Makefile.in | 7 ++----- src/include/version.h | 4 ++-- 9 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 src/bin/Makefile.global diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 8a89f0710d..ce45262df8 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.22 1997/04/15 18:36:45 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.23 1997/04/26 05:04:13 scrappy Exp $ # # NOTES # Essentially all Postgres make files include this file and use the @@ -232,7 +232,7 @@ YFLAGS= @YFLAGS@ YACC= @YACC@ LEX= @LEX@ AROPT= @AROPT@ -CFLAGS= @CPPFLAGS@ @CFLAGS@ +CFLAGS= -I$(SRCDIR)/include @CPPFLAGS@ @CFLAGS@ CFLAGS_SL= @SHARED_LIB@ LDFLAGS= @LDFLAGS@ @LIBS@ DLSUFFIX= @DLSUFFIX@ diff --git a/src/bin/Makefile b/src/bin/Makefile index 17064b6edf..a37cadee56 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -7,12 +7,11 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.6 1996/11/13 10:35:20 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.7 1997/04/26 05:04:21 scrappy Exp $ # #------------------------------------------------------------------------- -SRCDIR=.. -include ../Makefile.global +#include ../Makefile.global .DEFAULT all: # diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global deleted file mode 100644 index 2eba103598..0000000000 --- a/src/bin/Makefile.global +++ /dev/null @@ -1,31 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile.inc-- -# global configurations for Makefiles in src/bin -# -# Copyright (c) 1994, Regents of the University of California -# -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.15 1997/04/24 14:30:09 scrappy Exp $ -# -#------------------------------------------------------------------------- - -SRCDIR=.. -LIBPQDIR:= $(SRCDIR)/libpq - -# -# And where libpq goes, so goes the authentication stuff... -# -ifdef KRBVERS -LDFLAGS+= $(KRBLIBS) -CFLAGS+= $(KRBFLAGS) -endif - - -INCLUDE_OPT := \ - -I$(LIBPQDIR) \ - -I$(SRCDIR)/include - -CFLAGS += $(INCLUDE_OPT) - diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in index a8829df009..20cf9f4def 100644 --- a/src/bin/pg_dump/Makefile.in +++ b/src/bin/pg_dump/Makefile.in @@ -7,13 +7,12 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.2 1997/04/04 10:41:17 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.3 1997/04/26 05:04:55 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -include ../Makefile.global OBJS= pg_dump.o common.o @STRDUP@ diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile index 85ac6d0d6a..42c6fbc753 100644 --- a/src/bin/pg_id/Makefile +++ b/src/bin/pg_id/Makefile @@ -7,13 +7,12 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.5 1997/04/04 10:41:26 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.6 1997/04/26 05:05:20 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -include ../Makefile.global OBJS= pg_id.o diff --git a/src/bin/pg_version/Makefile b/src/bin/pg_version/Makefile index ddfeef07fd..26da635b4d 100644 --- a/src/bin/pg_version/Makefile +++ b/src/bin/pg_version/Makefile @@ -7,16 +7,17 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.4 1997/04/04 10:41:37 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.5 1997/04/26 05:05:43 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -include ../Makefile.global OBJS= pg_version.o ../../utils/version.o +CFLAGS+= -I$(SRCDIR)/include + all: pg_version pg_version: submake $(OBJS) diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 68c9eb742d..3a6919b5dd 100644 --- a/src/bin/pgtclsh/Makefile +++ b/src/bin/pgtclsh/Makefile @@ -7,13 +7,12 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.6 1997/04/04 10:42:11 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.7 1997/04/26 05:06:12 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -include ../Makefile.global CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/libpgtcl diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in index 91a8322230..ab7de496fd 100644 --- a/src/bin/psql/Makefile.in +++ b/src/bin/psql/Makefile.in @@ -7,17 +7,14 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.4 1997/04/04 10:42:23 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.5 1997/04/26 05:06:40 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -INCLUDE_OPT:= -I$(LIBPQDIR) \ - -I../../include - -CFLAGS+= $(INCLUDE_OPT) +CFLAGS+= -I$(LIBPQDIR) OBJS= psql.o stringutils.o @STRDUP@ diff --git a/src/include/version.h b/src/include/version.h index ecdaa860f7..927c11170d 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -4,7 +4,7 @@ * this file contains the interface to version.c. * Also some parameters. * - * $Id: version.h,v 1.1 1996/11/11 14:24:38 bryanh Exp $ + * $Id: version.h,v 1.2 1997/04/26 05:07:12 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ void SetPgVersion(const char *path, char **reason_p); #define PG_RELEASE 6 -#define PG_VERSION 0 +#define PG_VERSION 1 #define PG_VERFILE "PG_VERSION" #endif -- 2.40.0