Whoops, redo Ultrix patch so the other ports still compile.
This commit is contained in:
Bryan Henderson
parent
c118543186
commit
93f722536f
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.11 1996/11/14 09:24:39 bryanh Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.12 1996/11/26 07:37:54 bryanh Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -27,8 +27,7 @@ endif
|
|||
|
||||
INCLUDE_OPT := \
|
||||
-I$(LIBPQDIR) \
|
||||
-I$(SRCDIR)/include \
|
||||
-I$(SRCDIR)/src/backend/port/$(PORTNAME)
|
||||
-I$(SRCDIR)/include
|
||||
|
||||
CFLAGS += $(INCLUDE_OPT)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.9 1996/11/26 03:19:36 bryanh Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.10 1996/11/26 07:38:16 bryanh Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -15,15 +15,20 @@ SRCDIR= ../..
|
|||
include ../Makefile.global
|
||||
include ../../Makefile.global
|
||||
|
||||
CFLAGS+= -I../../backend/port/${PORTNAME}
|
||||
|
||||
OBJS= pg_dump.o common.o
|
||||
|
||||
ifeq ($(PORTNAME), ultrix4)
|
||||
OBJS+= ../../utils/strdup.o
|
||||
endif
|
||||
|
||||
all: submake pg_dump
|
||||
|
||||
pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
|
||||
$(CC) $(LDFLAGS) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
|
||||
|
||||
../../utils/strdup.o:
|
||||
$(MAKE) -C ../../utils/strdup.o
|
||||
|
||||
.PHONY: submake
|
||||
submake:
|
||||
$(MAKE) -C $(LIBPQDIR) libpq.a
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.8 1996/11/26 03:19:40 bryanh Exp $
|
||||
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.9 1996/11/26 07:38:18 bryanh Exp $
|
||||
*
|
||||
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
|
||||
*
|
||||
|
|
@ -29,7 +29,9 @@
|
|||
|
||||
#include "postgres.h"
|
||||
#include "libpq-fe.h"
|
||||
#include <port-protos.h> /* for strdup() */
|
||||
#ifdef NEED_STRDUP
|
||||
#include "strdup.h"
|
||||
#endif
|
||||
|
||||
#include "pg_dump.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.17 1996/11/26 03:19:45 bryanh Exp $
|
||||
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.18 1996/11/26 07:38:19 bryanh Exp $
|
||||
*
|
||||
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
|
||||
*
|
||||
|
|
@ -54,7 +54,9 @@
|
|||
#include "postgres.h"
|
||||
#include "access/htup.h"
|
||||
#include "libpq-fe.h"
|
||||
#include <port-protos.h> /* for strdup() */
|
||||
#ifdef NEED_STRDUP
|
||||
#include "strdup.h"
|
||||
#endif
|
||||
|
||||
#include "pg_dump.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.14 1996/11/26 03:19:54 bryanh Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.15 1996/11/26 07:38:24 bryanh Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -16,8 +16,7 @@ include ../../Makefile.global
|
|||
|
||||
INCLUDE_OPT:= \
|
||||
-I$(LIBPQDIR) \
|
||||
-I../../include \
|
||||
-I../../backend/port/$(PORTNAME)
|
||||
-I../../include
|
||||
|
||||
CFLAGS+= $(INCLUDE_OPT)
|
||||
#
|
||||
|
|
@ -63,11 +62,18 @@ ifneq ($(USE_READLINE), true)
|
|||
OBJS+= rlstubs.o
|
||||
endif
|
||||
|
||||
ifeq ($(PORTNAME), ultrix4)
|
||||
OBJS+= ../../utils/strdup.o
|
||||
endif
|
||||
|
||||
all: submake psql
|
||||
|
||||
psql: $(OBJS) $(LIBPQDIR)/libpq.a
|
||||
$(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
|
||||
|
||||
../../utils/strdup.o:
|
||||
$(MAKE) -C ../../utils strdup.o
|
||||
|
||||
.PHONY: submake
|
||||
submake:
|
||||
$(MAKE) -C $(LIBPQDIR) libpq.a
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.34 1996/11/26 03:19:58 bryanh Exp $
|
||||
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.35 1996/11/26 07:38:28 bryanh Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -24,7 +24,9 @@
|
|||
#include "libpq-fe.h"
|
||||
#include "stringutils.h"
|
||||
#include "psqlHelp.h"
|
||||
#include <port-protos.h> /* for strdup() */
|
||||
#ifdef NEED_STRDUP
|
||||
#include "strdup.h"
|
||||
#endif
|
||||
|
||||
#ifdef NOREADLINE
|
||||
#include "rlstubs.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.6 1996/11/26 03:20:06 bryanh Exp $
|
||||
* $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.7 1996/11/26 07:38:36 bryanh Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -16,7 +16,9 @@
|
|||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <port-protos.h> /* for strdup() */
|
||||
#ifdef NEED_STRDUP
|
||||
#include "strdup.h"
|
||||
#endif
|
||||
|
||||
#include "stringutils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
# define NEED_ISINF
|
||||
# define USE_POSIX_TIME
|
||||
# define NEED_UNION_SEMUN
|
||||
# define NEED_STRDUP
|
||||
#endif
|
||||
|
||||
#if defined(linux)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.20 1996/11/26 06:33:18 bryanh Exp $
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.21 1996/11/26 07:38:46 bryanh Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ SRCDIR= ..
|
|||
include ../Makefile.global
|
||||
|
||||
# We need the backend directory here for its fmgr.h
|
||||
INCLUDE_OPT= -I../include -I../backend -I../backend/port/$(PORTNAME)
|
||||
INCLUDE_OPT= -I../include -I../backend
|
||||
|
||||
CFLAGS+= $(INCLUDE_OPT)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.20 1996/11/26 03:20:35 bryanh Exp $
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.21 1996/11/26 07:38:55 bryanh Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -30,7 +30,9 @@
|
|||
#include "fe-auth.h"
|
||||
#include "libpq-fe.h"
|
||||
|
||||
#include <port-protos.h> /* for strdup() */
|
||||
#ifdef NEED_STRDUP
|
||||
#include "strdup.h"
|
||||
#endif
|
||||
|
||||
#if defined(ultrix4) || defined(next)
|
||||
/* ultrix is lame and doesn't have strdup in libc for some reason */
|
||||
|
|
|
|||
|
|
@ -4,7 +4,14 @@
|
|||
# Makefile for utils
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.2 1996/11/11 16:30:07 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.3 1996/11/26 07:39:11 bryanh 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
|
||||
# in this directory. (You don't see strdup mentioned because the implicit
|
||||
# rule does the job). We don't make strdup.o unless asked to explicitly
|
||||
# because the strdup.c in this directory may conflict with the strdup()
|
||||
# prototype from the system library and cause a compile error.
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue