Skip to content

Commit ee85595

Browse files
bmomjianbmomjian
committed
> Please find enclose a submission to fix these problems.
> > The patch adds missing the "libpgport.a" file to the installation under > "install-all-headers". It is needed by some contribs. I install the > library in "pkglibdir", but I was wondering whether it should be "libdir"? > I was wondering also whether it would make sense to have a "libpgport.so"? > > It fixes various macros which are used by contrib makefiles, especially > libpq_*dir and LDFLAGS when used under PGXS. It seems to me that they are > needed to > > It adds the ability to test and use PGXS with contribs, with "make > USE_PGXS=1". Without the macro, this is exactly as before, there should be > no difference, esp. wrt the vpath feature that seemed broken by previous > submission. So it should not harm anybody, and it is useful at least to me. > > It fixes some inconsistencies in various contrib makefiles > (useless override, ":=" instead of "="). Fabien COELHO
1 parent ff8e552 commit ee85595

File tree

43 files changed

+430
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+430
-241
lines changed

‎contrib/btree_gist/Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11

2-
subdir = contrib/btree_gist
3-
top_builddir = ../..
4-
include $(top_builddir)/src/Makefile.global
5-
62
MODULE_big = btree_gist
73

84
OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o btree_int4.o btree_int8.o \
@@ -16,4 +12,12 @@ DOCS = README.btree_gist
1612
REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz time timetz \
1713
date interval macaddr inet cidr text varchar char bytea bit varbit numeric
1814

15+
ifdef USE_PGXS
16+
PGXS = $(shell pg_config --pgxs)
17+
include $(PGXS)
18+
else
19+
subdir = contrib/btree_gist
20+
top_builddir = ../..
21+
include $(top_builddir)/src/Makefile.global
1922
include $(top_srcdir)/contrib/contrib-global.mk
23+
endif

‎contrib/chkpass/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
# $PostgreSQL: pgsql/contrib/chkpass/Makefile,v 1.5 2003/11/29 19:51:19 pgsql Exp $
2-
3-
subdir = contrib/chkpass
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/chkpass/Makefile,v 1.6 2004/08/20 20:13:02 momjian Exp $
62

73
MODULE_big = chkpass
84
OBJS = chkpass.o
95
SHLIB_LINK = $(filter -lcrypt, $(LIBS))
106
DATA_built = chkpass.sql
117
DOCS = README.chkpass
128

9+
ifdef USE_PGXS
10+
PGXS = $(shell pg_config --pgxs)
11+
include $(PGXS)
12+
else
13+
subdir = contrib/chkpass
14+
top_builddir = ../..
15+
include $(top_builddir)/src/Makefile.global
1316
include $(top_srcdir)/contrib/contrib-global.mk
17+
endif

‎contrib/cube/Makefile

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.11 2003/11/29 19:51:21 pgsql Exp $
2-
3-
subdir = contrib/cube
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.12 2004/08/20 20:13:02 momjian Exp $
62

73
MODULE_big = cube
84
OBJS= cube.o cubeparse.o
@@ -11,6 +7,19 @@ DATA_built = cube.sql
117
DOCS = README.cube
128
REGRESS = cube
139

10+
EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
11+
12+
13+
ifdef USE_PGXS
14+
PGXS = $(shell pg_config --pgxs)
15+
include $(PGXS)
16+
else
17+
subdir = contrib/cube
18+
top_builddir = ../..
19+
include $(top_builddir)/src/Makefile.global
20+
include $(top_srcdir)/contrib/contrib-global.mk
21+
endif
22+
1423

1524
# cubescan is compiled as part of cubeparse
1625
cubeparse.o: cubescan.c
@@ -32,8 +41,3 @@ ifdef FLEX
3241
else
3342
@$(missing) flex $< $@
3443
endif
35-
36-
EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
37-
38-
39-
include $(top_srcdir)/contrib/contrib-global.mk

‎contrib/dbase/Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/dbase/Makefile,v 1.5 2003/11/29 19:51:22 pgsql Exp $
2-
3-
subdir = contrib/dbase
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/dbase/Makefile,v 1.6 2004/08/20 20:13:02 momjian Exp $
62

73
PROGRAM = dbf2pg
84
OBJS = dbf.o dbf2pg.o endian.o
@@ -18,4 +14,13 @@ PG_LIBS = $(libpq)
1814
DOCS = README.dbf2pg
1915
MAN = dbf2pg.1 # XXX not implemented
2016

17+
18+
ifdef USE_PGXS
19+
PGXS = $(shell pg_config --pgxs)
20+
include $(PGXS)
21+
else
22+
subdir = contrib/dbase
23+
top_builddir = ../..
24+
include $(top_builddir)/src/Makefile.global
2125
include $(top_srcdir)/contrib/contrib-global.mk
26+
endif

‎contrib/dblink/Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.8 2003/11/29 19:51:34 pgsql Exp $
2-
3-
subdir = contrib/dblink
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.9 2004/08/20 20:13:03 momjian Exp $
62

73
MODULE_big = dblink
84
PG_CPPFLAGS = -I$(libpq_srcdir)
@@ -13,4 +9,13 @@ DATA_built = dblink.sql
139
DOCS = README.dblink
1410
REGRESS = dblink
1511

12+
13+
ifdef USE_PGXS
14+
PGXS = $(shell pg_config --pgxs)
15+
include $(PGXS)
16+
else
17+
subdir = contrib/dblink
18+
top_builddir = ../..
19+
include $(top_builddir)/src/Makefile.global
1620
include $(top_srcdir)/contrib/contrib-global.mk
21+
endif

‎contrib/dbmirror/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
# $PostgreSQL: pgsql/contrib/dbmirror/Makefile,v 1.2 2003/11/29 19:51:34 pgsql Exp $
2-
3-
subdir = contrib/dbmirror
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/dbmirror/Makefile,v 1.3 2004/08/20 20:13:03 momjian Exp $
62

73
MODULES = pending
84
DOCS = README.dbmirror
95

6+
ifdef USE_PGXS
7+
PGXS = $(shell pg_config --pgxs)
8+
include $(PGXS)
9+
else
10+
subdir = contrib/dbmirror
11+
top_builddir = ../..
12+
include $(top_builddir)/src/Makefile.global
1013
include $(top_srcdir)/contrib/contrib-global.mk
14+
endif

‎contrib/dbsize/Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
subdir = contrib/dbsize
2-
top_builddir = ../..
3-
include $(top_builddir)/src/Makefile.global
4-
51
MODULES = dbsize
62
DATA_built = dbsize.sql
73
DOCS = README.dbsize
84

5+
ifdef USE_PGXS
6+
PGXS = $(shell pg_config --pgxs)
7+
include $(PGXS)
8+
else
9+
subdir = contrib/dbsize
10+
top_builddir = ../..
11+
include $(top_builddir)/src/Makefile.global
912
include $(top_srcdir)/contrib/contrib-global.mk
13+
endif

‎contrib/earthdistance/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.13 2003/11/29 19:51:35 pgsql Exp $
2-
3-
subdir = contrib/earthdistance
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.14 2004/08/20 20:13:03 momjian Exp $
62

73
MODULES = earthdistance
84
DATA_built = earthdistance.sql
95
DOCS = README.earthdistance
106
REGRESS = earthdistance
117

8+
ifdef USE_PGXS
9+
PGXS = $(shell pg_config --pgxs)
10+
include $(PGXS)
11+
else
12+
subdir = contrib/earthdistance
13+
top_builddir = ../..
14+
include $(top_builddir)/src/Makefile.global
1215
include $(top_srcdir)/contrib/contrib-global.mk
16+
endif

‎contrib/findoidjoins/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/findoidjoins/Makefile,v 1.15 2003/11/29 19:51:35 pgsql Exp $
2-
3-
subdir = contrib/findoidjoins
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/findoidjoins/Makefile,v 1.16 2004/08/20 20:13:03 momjian Exp $
62

73
PROGRAM = findoidjoins
84
OBJS = findoidjoins.o
@@ -13,4 +9,12 @@ PG_LIBS = $(libpq)
139
SCRIPTS = make_oidjoins_check
1410
DOCS = README.findoidjoins
1511

12+
ifdef USE_PGXS
13+
PGXS = $(shell pg_config --pgxs)
14+
include $(PGXS)
15+
else
16+
subdir = contrib/findoidjoins
17+
top_builddir = ../..
18+
include $(top_builddir)/src/Makefile.global
1619
include $(top_srcdir)/contrib/contrib-global.mk
20+
endif

‎contrib/fulltextindex/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
# $PostgreSQL: pgsql/contrib/fulltextindex/Makefile,v 1.12 2003/11/29 19:51:35 pgsql Exp $
2-
3-
subdir = contrib/fulltextindex
4-
top_builddir = ../..
5-
include $(top_builddir)/src/Makefile.global
1+
# $PostgreSQL: pgsql/contrib/fulltextindex/Makefile,v 1.13 2004/08/20 20:13:04 momjian Exp $
62

73
MODULES = fti
84
DATA_built = fti.sql
95
DOCS = README.fti
106
SCRIPTS = fti.pl
117

8+
ifdef USE_PGXS
9+
PGXS = $(shell pg_config --pgxs)
10+
include $(PGXS)
11+
else
12+
subdir = contrib/fulltextindex
13+
top_builddir = ../..
14+
include $(top_builddir)/src/Makefile.global
1215
include $(top_srcdir)/contrib/contrib-global.mk
16+
endif

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy