aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'src/interfaces')
-rw-r--r--src/interfaces/Makefile4
-rw-r--r--src/interfaces/ecpg/Makefile2
-rw-r--r--src/interfaces/ecpg/include/Makefile2
-rw-r--r--src/interfaces/ecpg/lib/Makefile8
-rw-r--r--src/interfaces/ecpg/preproc/Makefile4
-rw-r--r--src/interfaces/libpgeasy/Makefile8
-rw-r--r--src/interfaces/libpgtcl/Makefile6
-rw-r--r--src/interfaces/libpq++/Makefile10
-rw-r--r--src/interfaces/libpq/Makefile4
-rw-r--r--src/interfaces/odbc/GNUmakefile6
-rw-r--r--src/interfaces/perl5/GNUmakefile6
-rw-r--r--src/interfaces/python/GNUmakefile15
-rw-r--r--src/interfaces/python/Setup.in.raw2
13 files changed, 39 insertions, 38 deletions
diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index 146fbf93e89..5640c8d0bc3 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -4,13 +4,13 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.41 2000/07/19 16:30:06 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.42 2000/08/31 16:11:30 petere Exp $
#
#-------------------------------------------------------------------------
subdir = src/interfaces
top_builddir = ../..
-include ../Makefile.global
+include $(top_builddir)/src/Makefile.global
DIRS := libpq ecpg libpgeasy
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index d3f9df7c9a4..2637a2ed015 100644
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -1,6 +1,6 @@
subdir = src/interfaces/ecpg
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
all install installdirs uninstall dep depend distprep:
$(MAKE) -C include $@
diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 3d36e878eb2..9255fe78b5c 100644
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -1,6 +1,6 @@
subdir = src/interfaces/ecpg/include
top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
install: all installdirs install-headers
diff --git a/src/interfaces/ecpg/lib/Makefile b/src/interfaces/ecpg/lib/Makefile
index a21a3c854f5..7e63ef2b915 100644
--- a/src/interfaces/ecpg/lib/Makefile
+++ b/src/interfaces/ecpg/lib/Makefile
@@ -4,25 +4,25 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.6 2000/06/28 18:29:39 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.7 2000/08/31 16:11:36 petere Exp $
#
#-------------------------------------------------------------------------
subdir = src/interfaces/ecpg/lib
top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME= ecpg
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1.1
-CFLAGS+= -I$(top_srcdir)/src/interfaces/ecpg/include -I$(LIBPQDIR)
+CPPFLAGS += -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
connect.o misc.o
-SHLIB_LINK= $(LIBPQ)
+SHLIB_LINK= $(libpq)
all: all-lib
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index bba2ecdeb7e..aeb0a0fc075 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -1,12 +1,12 @@
subdir = src/interfaces/ecpg/preproc
top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
MAJOR_VERSION=2
MINOR_VERSION=7
PATCHLEVEL=1
-CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
+CPPFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-DINCLUDE_PATH=\"$(includedir)\"
diff --git a/src/interfaces/libpgeasy/Makefile b/src/interfaces/libpgeasy/Makefile
index fdc64459746..d31775665e6 100644
--- a/src/interfaces/libpgeasy/Makefile
+++ b/src/interfaces/libpgeasy/Makefile
@@ -2,13 +2,13 @@
#
# Makefile for src/interfaces/libpgeasy
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.1 2000/06/28 18:29:41 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.2 2000/08/31 16:11:42 petere Exp $
#
#-------------------------------------------------------------------------
subdir = src/interfaces/libpgeasy
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
# shared library parameters
@@ -16,11 +16,11 @@ NAME= pgeasy
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS += -I$(libpq_srcdir)
OBJS= libpgeasy.o halt.o
-SHLIB_LINK+= $(LIBPQ)
+SHLIB_LINK+= $(libpq)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is
diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile
index 72c53bc2bc0..cd9c1719eba 100644
--- a/src/interfaces/libpgtcl/Makefile
+++ b/src/interfaces/libpgtcl/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.19 2000/06/28 18:29:43 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.20 2000/08/31 16:11:45 petere Exp $
#
#-------------------------------------------------------------------------
@@ -16,11 +16,11 @@ NAME= pgtcl
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS += -I$(libpq_srcdir)
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
-SHLIB_LINK+= $(LIBPQ)
+SHLIB_LINK+= $(libpq)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile
index ad31cad6428..8430acb7abd 100644
--- a/src/interfaces/libpq++/Makefile
+++ b/src/interfaces/libpq++/Makefile
@@ -4,27 +4,27 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.23 2000/06/30 16:10:54 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.24 2000/08/31 16:11:51 petere Exp $
#
#-------------------------------------------------------------------------
subdir = src/interfaces/libpq++
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME= pq++
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1
SRCHEADERDIR = $(top_srcdir)/src/include
-CXXFLAGS+= -I$(SRCHEADERDIR) -I$(LIBPQDIR)
+CXXFLAGS+= -I$(SRCHEADERDIR) -I$(libpq_srcdir)
OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
ifeq ($(PORTNAME), win)
-SHLIB_LINK+= --driver-name g++ $(LIBPQ)
+SHLIB_LINK+= --driver-name g++ $(libpq)
else
-SHLIB_LINK= $(LIBPQ)
+SHLIB_LINK= $(libpq)
endif
# For CC on IRIX, must use CC as linker/archiver of C++ libraries
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 8fc0560e6f6..bd2dbd1db00 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -4,13 +4,13 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.39 2000/06/28 18:29:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.40 2000/08/31 16:11:48 petere Exp $
#
#-------------------------------------------------------------------------
subdir = src/interfaces/libpq
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
# shared library parameters
NAME= pq
diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile
index 29c5a12542a..685a98f6171 100644
--- a/src/interfaces/odbc/GNUmakefile
+++ b/src/interfaces/odbc/GNUmakefile
@@ -2,20 +2,20 @@
#
# GNUMakefile for psqlodbc (Postgres ODBC driver)
#
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.1 2000/06/28 18:29:54 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.2 2000/08/31 16:11:55 petere Exp $
#
#-------------------------------------------------------------------------
subdir = src/interfaces/odbc
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
# Shared library parameters
NAME = psqlodbc
SO_MAJOR_VERSION = 0
SO_MINOR_VERSION = 26
-CFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
+CPPFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
diff --git a/src/interfaces/perl5/GNUmakefile b/src/interfaces/perl5/GNUmakefile
index ae40e85f38e..7ad2c2402f3 100644
--- a/src/interfaces/perl5/GNUmakefile
+++ b/src/interfaces/perl5/GNUmakefile
@@ -4,11 +4,11 @@
# Makefile according to its own ideas and then invoke the rules from
# that file.
#
-# $Header: /cvsroot/pgsql/src/interfaces/perl5/Attic/GNUmakefile,v 1.1 2000/06/28 18:29:56 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/perl5/Attic/GNUmakefile,v 1.2 2000/08/31 16:11:58 petere Exp $
subdir = src/interfaces/perl5
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
all: Makefile libpq-all
@@ -19,7 +19,7 @@ Makefile: Makefile.PL
.PHONY: libpq-all
libpq-all:
- $(MAKE) -C $(top_builddir)/src/interfaces/libpq all
+ $(MAKE) -C $(libpq_builddir) all
# The klugery here is to ensure that the perl5 shared library gets
# built with the correct path to the installed location of libpq
diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile
index 1917c75c49e..dc5fa875f9b 100644
--- a/src/interfaces/python/GNUmakefile
+++ b/src/interfaces/python/GNUmakefile
@@ -4,20 +4,20 @@
#
# Written by Peter Eisentraut <peter_e@gmx.net>
#
-# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.1 2000/06/28 18:30:07 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.2 2000/08/31 16:12:01 petere Exp $
#
#-------------------------------------------------------------------
subdir = src/interfaces/python
top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
all: Makefile pgmodule.c libpq-all
$(MAKE) -f Makefile
.PHONY: libpq-all
libpq-all:
- $(MAKE) -C $(top_builddir)/src/interfaces/libpq all
+ $(MAKE) -C $(libpq_builddir) all
Makefile: Setup.in Makefile.pre.in
$(MAKE) -f Makefile.pre.in boot srcdir=$(srcdir) VPATH=$(srcdir)
@@ -26,10 +26,11 @@ Makefile.pre.in: $(python_extmakefile)
cp $< $@
Setup.in: Setup.in.raw
- sed -e "s%__LIBPQ__%${top_srcdir}/src/interfaces/libpq%g" \
- -e "s%__EXTRA_LIBS__%${LIBS}%g" \
- -e "s%__INCLUDES__%${top_srcdir}/src/include%g" \
- < $< > $@
+ sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \
+ -e 's,@libpq_builddir@,$(libpq_builddir),g' \
+ -e 's,@EXTRA_LIBS@,$(LIBS),g' \
+ -e 's,@pg_includedir@,$(top_srcdir)/src/include,g' \
+ $< > $@
install: all
@echo "Installing Python module"
diff --git a/src/interfaces/python/Setup.in.raw b/src/interfaces/python/Setup.in.raw
index dddb5588102..9c26d73968c 100644
--- a/src/interfaces/python/Setup.in.raw
+++ b/src/interfaces/python/Setup.in.raw
@@ -1,3 +1,3 @@
*shared*
-_pg pgmodule.c -I__LIBPQ__ -I__INCLUDES__ -L__LIBPQ__ -lpq __EXTRA_LIBS__
+_pg pgmodule.c -I@libpq_srcdir@ -I@pg_includedir@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 22:00:47 +0000