head	1.20;
access;
symbols
	REL9_0_0:1.20
	REL9_1_ALPHA1:1.20
	REL9_0_RC1:1.20
	REL9_0_BETA4:1.20
	REL9_0_STABLE:1.20.0.16
	REL9_0_BETA3:1.20
	REL9_0_BETA2:1.20
	REL7_4_29:1.5
	REL8_0_25:1.8
	REL8_1_21:1.10
	REL8_2_17:1.17
	REL8_3_11:1.20
	REL8_4_4:1.20
	REL9_0_BETA1:1.20
	REL9_0_ALPHA5_BRANCH:1.20.0.14
	REL9_0_ALPHA5:1.20
	REL7_4_28:1.5
	REL8_0_24:1.8
	REL8_1_20:1.10
	REL8_2_16:1.17
	REL8_3_10:1.20
	REL8_4_3:1.20
	REL9_0_ALPHA4:1.20
	REL9_0_ALPHA4_BRANCH:1.20.0.12
	REL8_5_ALPHA3:1.20
	REL8_5_ALPHA3_BRANCH:1.20.0.10
	REL7_4_27:1.5
	REL8_0_23:1.8
	REL8_1_19:1.10
	REL8_2_15:1.17
	REL8_3_9:1.20
	REL8_4_2:1.20
	REL8_5_ALPHA2:1.20
	REL8_5_ALPHA2_BRANCH:1.20.0.8
	REL7_4_26:1.5
	REL8_0_22:1.8
	REL8_1_18:1.10
	REL8_2_14:1.17
	REL8_3_8:1.20
	REL8_4_1:1.20
	REL8_5_ALPHA1:1.20
	REL8_5_ALPHA1_BRANCH:1.20.0.6
	REL8_4_STABLE:1.20.0.4
	REL8_4_0:1.20
	REL8_4_RC2:1.20
	REL8_4_RC1:1.20
	REL8_4_BETA2:1.20
	REL8_4_BETA1:1.20
	REL7_4_25:1.5
	REL8_0_21:1.8
	REL8_1_17:1.10
	REL8_2_13:1.17
	REL8_3_7:1.20
	REL7_4_24:1.5
	REL8_0_20:1.8
	REL8_1_16:1.10
	REL8_2_12:1.17
	REL8_3_6:1.20
	REL7_4_23:1.5
	REL8_0_19:1.8
	REL8_1_15:1.10
	REL8_2_11:1.17
	REL8_3_5:1.20
	REL7_4_22:1.5
	REL8_0_18:1.8
	REL8_1_14:1.10
	REL8_2_10:1.17
	REL8_3_4:1.20
	REL7_4_21:1.5
	REL8_0_17:1.8
	REL8_1_13:1.10
	REL8_2_9:1.17
	REL8_3_3:1.20
	REL7_4_20:1.5
	REL8_0_16:1.8
	REL8_1_12:1.10
	REL8_2_8:1.17
	REL8_3_2:1.20
	REL8_2_7:1.17
	REL8_3_1:1.20
	REL8_3_STABLE:1.20.0.2
	REL8_3_0:1.20
	REL8_3_RC2:1.20
	REL7_4_19:1.5
	REL8_0_15:1.8
	REL8_1_11:1.10
	REL8_2_6:1.17
	REL8_3_RC1:1.20
	REL8_3_BETA4:1.20
	REL8_3_BETA3:1.20
	REL8_3_BETA2:1.19
	REL8_3_BETA1:1.19
	REL7_4_18:1.5
	REL8_0_14:1.8
	REL8_1_10:1.10
	REL8_2_5:1.17
	REL7_4_17:1.5
	REL8_0_13:1.8
	REL8_1_9:1.10
	REL8_2_4:1.17
	REL8_0_12:1.8
	REL8_1_8:1.10
	REL8_2_3:1.17
	REL7_4_16:1.5
	REL8_0_11:1.8
	REL8_1_7:1.10
	REL8_2_2:1.17
	REL8_0_10:1.8
	REL8_1_6:1.10
	REL8_2_1:1.17
	REL7_4_15:1.5
	REL8_2_STABLE:1.17.0.2
	REL8_2_0:1.17
	REL8_2_RC1:1.17
	REL8_2_BETA3:1.17
	REL8_2_BETA2:1.17
	REL8_1_5:1.10
	REL8_0_9:1.8
	REL7_4_14:1.5
	REL8_2_BETA1:1.17
	REL7_4_13:1.5
	REL8_0_8:1.8
	REL8_1_4:1.10
	REL7_4_12:1.5
	REL8_0_7:1.8
	REL8_1_3:1.10
	REL7_4_11:1.5
	REL8_0_6:1.8
	REL8_1_2:1.10
	REL7_4_10:1.5
	REL8_0_5:1.8
	REL8_1_1:1.10
	REL8_1_STABLE:1.10.0.2
	REL8_1_0:1.10
	REL8_1_0RC1:1.10
	REL8_1_0BETA4:1.10
	REL8_1_0BETA3:1.10
	REL7_4_9:1.5
	REL8_0_4:1.8
	REL8_1_0BETA2:1.9
	REL8_1_0BETA1:1.9
	REL7_4_8:1.5
	REL8_0_3:1.8
	REL8_0_2:1.8
	REL7_4_7:1.5
	REL8_0_1:1.8
	REL8_0_STABLE:1.8.0.4
	REL8_0_0:1.8.0.2
	REL8_0_0RC5:1.8
	REL8_0_0RC4:1.8
	REL8_0_0RC3:1.8
	REL8_0_0RC2:1.8
	REL8_0_0RC1:1.8
	REL8_0_0BETA5:1.8
	REL8_0_0BETA4:1.8
	REL7_4_6:1.5
	REL8_0_0BETA3:1.7
	REL8_0_0BETA2:1.7
	REL7_4_5:1.5
	REL7_4_4:1.5
	REL8_0_0BETA1:1.6
	REL7_4_3:1.5
	REL7_4_2:1.5
	REL7_4_1:1.5
	REL7_4:1.5
	REL7_4_RC2:1.5
	REL7_4_STABLE:1.5.0.2
	REL7_4_RC1:1.5
	REL7_4_BETA5:1.5
	REL7_4_BETA4:1.5
	REL7_4_BETA3:1.5
	REL7_4_BETA2:1.5
	WIN32_DEV:1.3.0.2
	REL7_4_BETA1:1.3;
locks; strict;
comment	@# @;


1.20
date	2007.11.13.21.02.28;	author tgl;	state Exp;
branches;
next	1.19;

1.19
date	2007.06.26.22.05.03;	author tgl;	state Exp;
branches;
next	1.18;

1.18
date	2007.02.09.15.55.57;	author petere;	state Exp;
branches;
next	1.17;

1.17
date	2006.09.11.15.14.46;	author tgl;	state Exp;
branches;
next	1.16;

1.16
date	2006.07.15.03.33.14;	author tgl;	state Exp;
branches;
next	1.15;

1.15
date	2006.05.31.14.05.31;	author teodor;	state Exp;
branches;
next	1.14;

1.14
date	2006.05.02.11.28.54;	author teodor;	state Exp;
branches;
next	1.13;

1.13
date	2006.01.27.16.32.31;	author teodor;	state Exp;
branches;
next	1.12;

1.12
date	2005.11.21.12.27.57;	author teodor;	state Exp;
branches;
next	1.11;

1.11
date	2005.11.08.17.08.46;	author teodor;	state Exp;
branches;
next	1.10;

1.10
date	2005.09.27.17.13.11;	author tgl;	state Exp;
branches;
next	1.9;

1.9
date	2005.07.24.23.30.10;	author tgl;	state Exp;
branches;
next	1.8;

1.8
date	2004.10.17.23.09.31;	author tgl;	state Exp;
branches;
next	1.7;

1.7
date	2004.08.20.20.13.09;	author momjian;	state Exp;
branches;
next	1.6;

1.6
date	2003.11.29.19.51.36;	author pgsql;	state Exp;
branches;
next	1.5;

1.5
date	2003.08.26.10.01.02;	author teodor;	state Exp;
branches;
next	1.4;

1.4
date	2003.08.23.04.25.28;	author petere;	state Exp;
branches;
next	1.3;

1.3
date	2003.08.04.19.52.33;	author tgl;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2003.08.04.14.54.47;	author teodor;	state Exp;
branches;
next	1.1;

1.1
date	2003.07.21.10.26.26;	author teodor;	state Exp;
branches;
next	;

1.3.2.1
date	2003.09.07.04.36.39;	author momjian;	state Exp;
branches;
next	;


desc
@@


1.20
log
@Replace the now-incompatible-with-core contrib/tsearch2 module with a
compatibility package.  This supports importing dumps from past versions
using tsearch2, and provides the old names and API for most functions
that were changed.  (rewrite(ARRAY[...]) is a glaring omission, though.)

Pavel Stehule and Tom Lane
@
text
@# $PostgreSQL$

MODULES = tsearch2
DATA_built = tsearch2.sql
DATA = uninstall_tsearch2.sql
REGRESS = tsearch2

ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = contrib/tsearch2
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
@


1.19
log
@Fix PGXS conventions so that extensions can be built against Postgres
installations whose pg_config program does not appear first in the PATH.
Per gripe from Eddie Stanley and subsequent discussions with Fabien Coelho
and others.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.18 2007/02/09 15:55:57 petere Exp $
d3 3
a5 19
MODULE_big = tsearch2
OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
       dict_snowball.o dict_ispell.o dict_syn.o dict_thesaurus.o \
       wparser.o wparser_def.o \
       ts_cfg.o tsvector.o query_cleanup.o crc32.o query.o gistidx.o \
       tsvector_op.o rank.o ts_stat.o \
       query_util.o query_support.o query_rewrite.o query_gist.o \
       ts_locale.o ts_lexize.o ginidx.o

SUBDIRS     = snowball ispell wordparser
SUBDIROBJS  = $(SUBDIRS:%=%/SUBSYS.o)

OBJS	+= $(SUBDIROBJS)

PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser

DATA = stopword/english.stop stopword/russian.stop stopword/russian.stop.utf8 thesaurus
DATA_built = tsearch2.sql uninstall_tsearch2.sql
DOCS = README.tsearch2
a7 3
SHLIB_LINK += $(filter -lm, $(LIBS))


a17 20


$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;

.PHONY: $(SUBDIRS:%=%-recursive)

$(SUBDIRS:%=%-recursive):
	$(MAKE) -C $(subst -recursive,,$@@) SUBSYS.o

tsearch2.sql: tsearch.sql.in
	sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@@

uninstall_tsearch2.sql: untsearch.sql.in
	cp $< $@@

.PHONY: subclean
clean: subclean

subclean:
	for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done
@


1.18
log
@Replace useless uses of := by = in makefiles.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.17 2006/09/11 15:14:46 tgl Exp $
d28 2
a29 1
PGXS := $(shell pg_config --pgxs)
@


1.17
log
@Rename the uninstall scripts for contrib/lo and contrib/tsearch2 to
match the convention that foo's uninstall script is uninstall_foo.sql.
Also, stop installing lo_test.sql, which really ought to be made into
a regression test anyway (though it's unclear how to avoid a dependency
on the current OID counter...)
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.16 2006/07/15 03:33:14 tgl Exp $
d12 2
a13 2
SUBDIRS     := snowball ispell wordparser
SUBDIROBJS  := $(SUBDIRS:%=%/SUBSYS.o)
@


1.16
log
@Fix some makefiles that fail to yield good results from 'make -qp'.
This doesn't really matter for ordinary building of Postgres, but it's
useful for automated checks, such as my just-committed pgcheckdefines.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.15 2006/05/31 14:05:31 teodor Exp $
d20 1
a20 1
DATA_built = tsearch2.sql untsearch2.sql
d48 1
a48 1
untsearch2.sql: untsearch.sql.in
@


1.15
log
@Add thesaurus dictionary which can replace N>0 lexemes by M>0 lexemes.
It required some changes in lexize algorithm, but interface with
dictionaries stays compatible with old dictionaries.

Funded by Georgia Public Library Service and LibLime, Inc.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.14 2006/05/02 11:28:54 teodor Exp $
d40 2
@


1.14
log
@GIN: Generalized Inverted iNdex.
text[], int4[], Tsearch2 support for GIN.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.13 2006/01/27 16:32:31 teodor Exp $
d5 1
a5 1
       dict_snowball.o dict_ispell.o dict_syn.o \
d10 1
a10 1
       ts_locale.o ginidx.o
d19 1
a19 1
DATA = stopword/english.stop stopword/russian.stop stopword/russian.stop.utf8
@


1.13
log
@Snowball multibyte. It's a pity, but snowball sources is very diferent for multibyte and
singlebyte encodings, so we should have snowball for every encodings.

I hope that finalize multibyte support work in tsearch2, but testing is needed...
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.12 2005/11/21 12:27:57 teodor Exp $
d10 1
a10 1
       ts_locale.o
@


1.12
log
@Text parser rewritten:
        - supports multibyte encodings
        - more strict rules for lexemes
        - flex isn't used
Add:
        - tsquery plainto_tsquery(text)
          Function makes tsquery from plain text.
        - &&, ||, !! operation for tsquery for combining
          tsquery from it's parts:  'foo & bar' || 'asd' => 'foo & bar | asd'
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.11 2005/11/08 17:08:46 teodor Exp $
d19 1
a19 1
DATA = stopword/english.stop stopword/russian.stop
@


1.11
log
@New features for tsearch2:
1 Comparison operation for tsquery
2 Btree index on tsquery
3 numnode(tsquery) - returns 'length' of tsquery
4 tsquery @@ tsquery, tsquery ~ tsquery - contains, contained for tsquery.
  Note: They don't gurantee exact result, only MAY BE, so it
  useful only for speed up rewrite functions
5 GiST index support for @@,~
6 rewrite():
        select rewrite(orig, what, to);
        select rewrite(ARRAY[orig, what, to]) from tsquery_table;
        select rewrite(orig, 'select what, to from tsquery_table;');
7 significantly improve cover algorithm
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.10 2005/09/27 17:13:11 tgl Exp $
d9 2
a10 1
       query_util.o query_support.o query_rewrite.o query_gist.o
@


1.10
log
@PGXS should be set with := not =, as specified in the documentation,
to avoid useless multiple executions of pg_config.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.9 2005/07/24 23:30:10 tgl Exp $
d7 3
a9 2
       ts_cfg.o tsvector.o rewrite.o crc32.o query.o gistidx.o \
       tsvector_op.o rank.o ts_stat.o
@


1.9
log
@Partial fixes for contrib build on AIX: include -lm where needed.
Per Rocco Altier.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.8 2004/10/17 23:09:31 tgl Exp $
d26 1
a26 1
PGXS = $(shell pg_config --pgxs)
@


1.8
log
@Make the standard stopword files be sought relative to share_dir, so
that a tsearch2 installation can be relocatable.
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.7 2004/08/20 20:13:09 momjian Exp $
d22 1
a22 1
SHLIB_LINK := -lm
@


1.7
log
@> 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
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql-server/contrib/tsearch2/Makefile,v 1.6 2003/11/29 19:51:36 pgsql Exp $
d42 1
a42 2
	sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' \
	    -e 's,DATA_PATH,$(datadir)/contrib,g' $< >$@@
@


1.6
log
@
$Header: -> $PostgreSQL Changes ...
@
text
@d1 1
a1 6
# $PostgreSQL: /cvsroot/pgsql-server/contrib/tsearch2/Makefile,v 1.5 2003/08/26 10:01:02 teodor Exp $

subdir = contrib/tsearch2
top_builddir = ../..
include $(top_builddir)/src/Makefile.global

d13 1
a13 6
OBJS:= $(OBJS) $(SUBDIROBJS)

$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;

$(SUBDIRS:%=%-recursive):
	$(MAKE) -C $(subst -recursive,,$@@) SUBSYS.o
d24 17
a52 2
 
include $(top_srcdir)/contrib/contrib-global.mk
@


1.5
log
@fix module name in MODULE_PATHNAME substitution
@
text
@d1 1
a1 1
# $Header: /cvsroot/pgsql-server/contrib/tsearch2/Makefile,v 1.4 2003/08/23 04:25:28 petere Exp $
@


1.4
log
@Bring the makefiles up to our conventions.
@
text
@d1 1
a1 1
# $Header$
a31 2
EXTRA_CLEAN = tsearch2.sql.in

d35 1
a35 1
	sed -e 's,MODULE_PATHNAME,$$libdir/$*,g' \
@


1.3
log
@Fix to build correctly outside source tree.
@
text
@d1 2
a7 2
override CPPFLAGS := -I$(srcdir) -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser $(CPPFLAGS)

d25 3
a34 2
include $(top_srcdir)/contrib/contrib-global.mk
# DO NOT DELETE
d36 3
a38 8
install: installstop

installstop:
	cp $(srcdir)/stopword/*.stop $(datadir)


tsearch2.sql.in: tsearch.sql._in
	sed 's,DATA_PATH,$(datadir),g' < $< > $@@
d43 1
d49 1
@


1.3.2.1
log
@Update this branch to match CVS head, includes WIN32 improvements.
@
text
@a0 2
# $Header: /cvsroot/pgsql-server/contrib/tsearch2/Makefile,v 1.5 2003/08/26 10:01:02 teodor Exp $

d6 2
a24 3
PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser

DATA = stopword/english.stop stopword/russian.stop
d29 2
d32 2
d35 8
a42 3
tsearch2.sql: tsearch.sql.in
	sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' \
	    -e 's,DATA_PATH,$(datadir)/contrib,g' $< >$@@
a46 1
.PHONY: subclean
a51 1
include $(top_srcdir)/contrib/contrib-global.mk
@


1.2
log
@make sub-Makefiles in the sub-directories
@
text
@d6 1
a6 1
override CPPFLAGS := -I. -I./snowball -I./ispell -I./wordparser $(CPPFLAGS)
d38 1
a38 1
	cp stopword/*.stop $(datadir)
@


1.1
log
@tsearch2 module
@
text
@d10 2
a11 3
       snowball/english_stem.o snowball/api.o snowball/russian_stem.o snowball/utilities.o \
       dict_snowball.o ispell/spell.o dict_ispell.o dict_syn.o \
       wparser.o wordparser/parser.o wordparser/deflex.o wparser_def.o \
d15 10
d29 1
a29 8
wordparser/parser.c: wordparser/parser.l
ifdef FLEX
	$(FLEX) $(FLEXFLAGS) -8 -Ptsearch2_yy -o'$@@' $<
else
	@@$(missing) flex $< $@@
endif

EXTRA_CLEAN = wordparser/parser.c tsearch2.sql.in
d45 3
a47 1
	cp $< $@@ 
d49 3
@

