Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3d0d78c

Browse files
committed
Bring the makefiles up to our conventions.
1 parent4682776 commit3d0d78c

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

‎contrib/tsearch2/Makefile‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
# $Header: /cvsroot/pgsql/contrib/tsearch2/Makefile,v 1.4 2003/08/23 04:25:28 petere Exp $
2+
13
subdir = contrib/tsearch2
24
top_builddir = ../..
35
include$(top_builddir)/src/Makefile.global
46

57

6-
overrideCPPFLAGS := -I$(srcdir) -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser$(CPPFLAGS)
7-
88
MODULE_big = tsearch2
99
OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o\
1010
dict_snowball.o dict_ispell.o dict_syn.o\
@@ -22,30 +22,28 @@ $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
2222
$(SUBDIRS:%=%-recursive):
2323
$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
2424

25+
PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser
26+
27+
DATA = stopword/english.stop stopword/russian.stop
2528
DATA_built = tsearch2.sql untsearch2.sql
2629
DOCS = README.tsearch2
2730
REGRESS = tsearch2
2831

2932
EXTRA_CLEAN = tsearch2.sql.in
3033

3134
SHLIB_LINK := -lm
32-
include$(top_srcdir)/contrib/contrib-global.mk
33-
# DO NOT DELETE
3435

35-
install: installstop
36-
37-
installstop:
38-
cp$(srcdir)/stopword/*.stop$(datadir)
39-
40-
41-
tsearch2.sql.in: tsearch.sql._in
42-
sed's,DATA_PATH,$(datadir),g'<$<>$@
36+
tsearch2.sql: tsearch.sql.in
37+
sed -e's,MODULE_PATHNAME,$$libdir/$*,g'\
38+
-e's,DATA_PATH,$(datadir)/contrib,g'$<>$@
4339

4440
untsearch2.sql: untsearch.sql.in
4541
cp$<$@
4642

43+
.PHONY: subclean
4744
clean: subclean
4845

4946
subclean:
5047
fordirin$(SUBDIRS);do$(MAKE) -C$$dir clean||exit;done
5148

49+
include$(top_srcdir)/contrib/contrib-global.mk

‎contrib/tsearch2/ispell/Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
# $Header: /cvsroot/pgsql/contrib/tsearch2/ispell/Attic/Makefile,v 1.4 2003/08/23 04:25:29 petere Exp $
2+
13
subdir = contrib/tsearch2/ispell
24
top_builddir = ../../..
35
include$(top_builddir)/src/Makefile.global
46

57

6-
overrideCPPFLAGS := -I$(srcdir) -I$(srcdir)/..$(CPPFLAGS)
8+
PG_CPPFLAGS = -I$(srcdir)/..$(CPPFLAGS)
79
overrideCFLAGS +=$(CFLAGS_SL)
810

911
SUBOBJS = spell.o
@@ -16,6 +18,3 @@ SUBSYS.o: $(SUBOBJS)
1618
EXTRA_CLEAN = SUBSYS.o$(SUBOBJS)
1719

1820
include$(top_srcdir)/contrib/contrib-global.mk
19-
# DO NOT DELETE
20-
21-

‎contrib/tsearch2/snowball/Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
# $Header: /cvsroot/pgsql/contrib/tsearch2/snowball/Attic/Makefile,v 1.4 2003/08/23 04:25:29 petere Exp $
2+
13
subdir = contrib/tsearch2/snowball
24
top_builddir = ../../..
35
include$(top_builddir)/src/Makefile.global
46

57

6-
overrideCPPFLAGS := -I$(srcdir) -I$(srcdir)/..$(CPPFLAGS)
8+
PG_CPPFLAGS= -I$(srcdir)/..
79
overrideCFLAGS +=$(CFLAGS_SL)
810

911
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
@@ -16,6 +18,3 @@ SUBSYS.o: $(SUBOBJS)
1618
EXTRA_CLEAN = SUBSYS.o$(SUBOBJS)
1719

1820
include$(top_srcdir)/contrib/contrib-global.mk
19-
# DO NOT DELETE
20-
21-

‎contrib/tsearch2/wordparser/Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
# $Header: /cvsroot/pgsql/contrib/tsearch2/wordparser/Attic/Makefile,v 1.4 2003/08/23 04:25:29 petere Exp $
2+
13
subdir = contrib/tsearch2/wordparser
24
top_builddir = ../../..
35
include$(top_builddir)/src/Makefile.global
46

57

6-
overrideCPPFLAGS := -I$(srcdir) -I$(srcdir)/..$(CPPFLAGS)
8+
PG_CPPFLAGS= -I$(srcdir)/..
79
overrideCFLAGS +=$(CFLAGS_SL)
810

911
SUBOBJS = parser.o deflex.o
@@ -23,6 +25,3 @@ SUBSYS.o: $(SUBOBJS)
2325
EXTRA_CLEAN = SUBSYS.o$(SUBOBJS) parser.c
2426

2527
include$(top_srcdir)/contrib/contrib-global.mk
26-
# DO NOT DELETE
27-
28-

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp