database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-19 13:42:17 +03:00
Code Activity

Fix relative path references so that make knowns which dependencies refer

Browse Source 
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
This commit is contained in:
Peter Eisentraut
2000-08-31 16:12:35 +00:00
parent d4266620e1
commit 424f0edcb8
102 changed files with 384 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/Makefile
View File

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

2
src/interfaces/ecpg/Makefile
View File

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

2
src/interfaces/ecpg/include/Makefile
View File

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

8
src/interfaces/ecpg/lib/Makefile
View File

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

4
src/interfaces/ecpg/preproc/Makefile
View File

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

8
src/interfaces/libpgeasy/Makefile
View File

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

6
src/interfaces/libpgtcl/Makefile
View File

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

10
src/interfaces/libpq++/Makefile
View File

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

4
src/interfaces/libpq/Makefile
View File

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

6
src/interfaces/odbc/GNUmakefile
View File

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

6
src/interfaces/perl5/GNUmakefile
View File

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

15
src/interfaces/python/GNUmakefile
View File

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

2
src/interfaces/python/Setup.in.raw
View File

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