Skip to content

Commit 091126f

Browse files
tglsfdctglsfdc
committed
Generated header files parse.h and fmgroids.h are now copied into
the src/include tree, so that -I backend is no longer necessary anywhere. Also, clean up some bit rot in contrib tree.
1 parent 18952f6 commit 091126f

File tree

91 files changed

+193
-399
lines changed

Some content is hidden

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

91 files changed

+193
-399
lines changed

‎contrib/Makefile

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,18 @@
1111
# The following subdirs give make errors:
1212
#
1313
# earthdistance
14-
# findoidjoins
15-
# isbn_issn
1614
# os2client
17-
# pginterface
1815

19-
all:
20-
for dir in *; do \
21-
if [ -e $$dir/Makefile ]; then \
22-
$(MAKE) -C $$dir; \
23-
fi; \
24-
done
25-
26-
install:
16+
all:
2717
for dir in *; do \
2818
if [ -e $$dir/Makefile ]; then \
2919
$(MAKE) -C $$dir $@ ; \
3020
fi; \
3121
done
3222

33-
install-doc:
34-
for dir in *; do \
35-
if [ -e $$dir/Makefile ]; then \
36-
$(MAKE) -C $$dir $@ ; \
37-
fi; \
38-
done || exit 0
39-
40-
clean:
41-
for dir in *; do \
42-
if [ -e $$dir/Makefile ]; then \
43-
$(MAKE) -C $$dir $@ ; \
44-
fi; \
45-
done || exit 0
46-
47-
distclean:
23+
.DEFAULT:
4824
for dir in *; do \
4925
if [ -e $$dir/Makefile ]; then \
5026
$(MAKE) -C $$dir $@ ; \
5127
fi; \
52-
done || exit 0
28+
done

‎contrib/array/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I./ \
15-
-I$(SRCDIR)/ \
16-
-I$(SRCDIR)/include \
17-
-I$(SRCDIR)/port/$(PORTNAME)
18-
19-
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
14+
CFLAGS += -I. $(CFLAGS_SL)
2015

2116
MODNAME = array_iterator
2217

@@ -61,7 +56,7 @@ $(SQLDIR):
6156
$(CC) $(CFLAGS) -shared -o $@ $<
6257

6358
depend dep:
64-
$(CC) -MM $(INCLUDE_OPT) *.c >depend
59+
$(CC) -MM $(CFLAGS) *.c >depend
6560

6661
clean:
6762
rm -f *~ $(MODULE) $(MODNAME).sql

‎contrib/datetime/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I./ \
15-
-I$(SRCDIR)/ \
16-
-I$(SRCDIR)/include \
17-
-I$(SRCDIR)/port/$(PORTNAME)
18-
19-
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
14+
CFLAGS += -I. $(CFLAGS_SL)
2015

2116
MODNAME = datetime_functions
2217

@@ -61,7 +56,7 @@ $(SQLDIR):
6156
$(CC) $(CFLAGS) -shared -o $@ $<
6257

6358
depend dep:
64-
$(CC) -MM $(INCLUDE_OPT) *.c >depend
59+
$(CC) -MM $(CFLAGS) *.c >depend
6560

6661
clean:
6762
rm -f *~ $(MODULE) $(MODNAME).sql

‎contrib/datetime/datetime_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ hhmm_in(char *str)
9696
*tm = &tt;
9797

9898
if (!PointerIsValid(str))
99-
elog(ERROR, "Bad (null) time external representation", NULL);
99+
elog(ERROR, "Bad (null) time external representation");
100100

101101
if (decode_24h_time(str, tm, &fsec) != 0)
102102
elog(ERROR, "Bad time external representation '%s'", str);

‎contrib/datetime/datetime_functions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ int4 date_month(DateADT val);
1515
int4 date_year(DateADT val);
1616
TimeADT *currenttime(void);
1717
DateADT currentdate(void);
18+
int4 date2mjd(DateADT val);
1819

1920
#endif
2021

‎contrib/fulltextindex/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include $(SRCDIR)/Makefile.global
44

55
CONTRIBDIR=$(LIBDIR)/contrib
66

7-
CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include
7+
CFLAGS+= $(CFLAGS_SL)
88

99
TARGETS= fti$(DLSUFFIX)
1010
CLEANFILES+= $(TARGETS)

‎contrib/isbn_issn/Makefile

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
#
22
# PostgreSQL types for ISBN and ISSN identifiers.
33
#
4-
# $Id: Makefile,v 1.1 1998/08/17 03:35:04 scrappy Exp $
4+
# $Id: Makefile,v 1.2 2000/05/29 05:44:26 tgl Exp $
55

6-
all: isbn.so issn.so
6+
SRCDIR= ../../src
77

8-
isbn.so: isbn.o
9-
ld -Bshareable -o isbn.so isbn.o
8+
include $(SRCDIR)/Makefile.global
109

11-
isbn.o: isbn.c
12-
cc -g -O -fPIC -I/usr/local/pgsql/include -c isbn.c
10+
CFLAGS+= $(CFLAGS_SL)
1311

14-
issn.so: issn.o
15-
ld -Bshareable -o issn.so issn.o
12+
all: isbn$(DLSUFFIX) issn$(DLSUFFIX)
1613

17-
issn.o: issn.c
18-
cc -g -O -fPIC -I/usr/local/pgsql/include -c issn.c
14+
install: isbn$(DLSUFFIX) issn$(DLSUFFIX)
15+
install -c isbn$(DLSUFFIX) issn$(DLSUFFIX) /usr/local/pgsql/modules
1916

20-
install: isbn.so issn.so
21-
install -c isbn.so issn.so /usr/local/pgsql/modules
22-
23-
#
24-
# eof
25-
#
17+
clean:
18+
rm -f isbn$(DLSUFFIX) issn$(DLSUFFIX) *.o

‎contrib/isbn_issn/isbn.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* PostgreSQL type definitions for ISBNs.
33
*
4-
* $Id: isbn.c,v 1.2 1999/05/25 16:05:40 momjian Exp $
4+
* $Id: isbn.c,v 1.3 2000/05/29 05:44:26 tgl Exp $
55
*/
66

77
#include <stdio.h>
@@ -47,8 +47,6 @@ isbn *
4747
isbn_in(char *str)
4848
{
4949
isbn *result;
50-
char *cp;
51-
int count;
5250

5351
if (strlen(str) != 13)
5452
{

‎contrib/isbn_issn/issn.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* PostgreSQL type definitions for ISSNs.
33
*
4-
* $Id: issn.c,v 1.2 1999/05/25 16:05:42 momjian Exp $
4+
* $Id: issn.c,v 1.3 2000/05/29 05:44:26 tgl Exp $
55
*/
66

77
#include <stdio.h>
@@ -47,8 +47,6 @@ issn *
4747
issn_in(char *str)
4848
{
4949
issn *result;
50-
char *cp;
51-
int count;
5250

5351
if (strlen(str) != 9)
5452
{

‎contrib/lo/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
#
44
# Makefile pinched from the ip-mac contrib package
55
#
6-
# $Id: Makefile,v 1.1 1998/06/16 07:07:11 momjian Exp $
6+
# $Id: Makefile,v 1.2 2000/05/29 05:44:27 tgl Exp $
77

88
SRCDIR= ../../src
99

1010
include $(SRCDIR)/Makefile.global
1111

1212
CONTRIBDIR=$(LIBDIR)/modules
1313

14-
CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include
14+
CFLAGS+= $(CFLAGS_SL)
1515

1616
ifdef REFINT_VERBOSE
1717
CFLAGS+= -DREFINT_VERBOSE

0 commit comments

Comments
 (0)