opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Marc G. Fournier 1997-04-26 05:07:12 +00:00
parent bcd0fae871
commit c2ae467300
9 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.global.in
View File

@ -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@

5
src/bin/Makefile
View File

@ -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:
#

31
src/bin/Makefile.global
View File

@ -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)

3
src/bin/pg_dump/Makefile.in
View File

@ -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@

3
src/bin/pg_id/Makefile
View File

@ -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

5
src/bin/pg_version/Makefile
View File

@ -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)

3
src/bin/pgtclsh/Makefile
View File

@ -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

7
src/bin/psql/Makefile.in
View File

@ -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@

4
src/include/version.h
View File

@ -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