From d6f0f44b5592c9c073a3b502d1cc590ad9731b21 Mon Sep 17 00:00:00 2001 From: Teodor Sigaev Date: Mon, 4 Aug 2003 14:54:47 +0000 Subject: [PATCH] make sub-Makefiles in the sub-directories --- contrib/tsearch2/Makefile | 31 +++++++++++++++++++------------ contrib/tsearch2/ispell/Makefile | 20 ++++++++++++++++++++ contrib/tsearch2/snowball/Makefile | 20 ++++++++++++++++++++ contrib/tsearch2/wordparser/Makefile | 27 +++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 contrib/tsearch2/ispell/Makefile create mode 100644 contrib/tsearch2/snowball/Makefile create mode 100644 contrib/tsearch2/wordparser/Makefile diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile index a58370ec51..7dd1e1b081 100644 --- a/contrib/tsearch2/Makefile +++ b/contrib/tsearch2/Makefile @@ -7,24 +7,26 @@ override CPPFLAGS := -I. -I./snowball -I./ispell -I./wordparser $(CPPFLAGS) MODULE_big = tsearch2 OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \ - 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 \ + dict_snowball.o dict_ispell.o dict_syn.o \ + wparser.o wparser_def.o \ ts_cfg.o tsvector.o rewrite.o crc32.o query.o gistidx.o \ tsvector_op.o rank.o ts_stat.o +SUBDIRS := snowball ispell wordparser +SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o) + +OBJS:= $(OBJS) $(SUBDIROBJS) + +$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ; + +$(SUBDIRS:%=%-recursive): + $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o + DATA_built = tsearch2.sql untsearch2.sql DOCS = README.tsearch2 REGRESS = tsearch2 -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 +EXTRA_CLEAN = tsearch2.sql.in SHLIB_LINK := -lm include $(top_srcdir)/contrib/contrib-global.mk @@ -40,5 +42,10 @@ tsearch2.sql.in: tsearch.sql._in sed 's,DATA_PATH,$(datadir),g' < $< > $@ untsearch2.sql: untsearch.sql.in - cp $< $@ + cp $< $@ + +clean: subclean +subclean: + for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done + diff --git a/contrib/tsearch2/ispell/Makefile b/contrib/tsearch2/ispell/Makefile new file mode 100644 index 0000000000..def0c3126c --- /dev/null +++ b/contrib/tsearch2/ispell/Makefile @@ -0,0 +1,20 @@ +subdir = contrib/tsearch2/ispell +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global + + +override CPPFLAGS := -I. -I.. $(CPPFLAGS) + +SUBOBJS = spell.o + +all: SUBSYS.o + +SUBSYS.o: $(SUBOBJS) + $(LD) $(LDREL) $(LDOUT) $@ $^ + +EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) + +include $(top_srcdir)/contrib/contrib-global.mk +# DO NOT DELETE + + diff --git a/contrib/tsearch2/snowball/Makefile b/contrib/tsearch2/snowball/Makefile new file mode 100644 index 0000000000..94e48fb466 --- /dev/null +++ b/contrib/tsearch2/snowball/Makefile @@ -0,0 +1,20 @@ +subdir = contrib/tsearch2/snowball +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global + + +override CPPFLAGS := -I. -I.. $(CPPFLAGS) + +SUBOBJS = english_stem.o api.o russian_stem.o utilities.o + +all: SUBSYS.o + +SUBSYS.o: $(SUBOBJS) + $(LD) $(LDREL) $(LDOUT) $@ $^ + +EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) + +include $(top_srcdir)/contrib/contrib-global.mk +# DO NOT DELETE + + diff --git a/contrib/tsearch2/wordparser/Makefile b/contrib/tsearch2/wordparser/Makefile new file mode 100644 index 0000000000..8fa1e1f06a --- /dev/null +++ b/contrib/tsearch2/wordparser/Makefile @@ -0,0 +1,27 @@ +subdir = contrib/tsearch2/wordparser +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global + + +override CPPFLAGS := -I. -I.. $(CPPFLAGS) + +SUBOBJS = parser.o deflex.o + +all: SUBSYS.o + +parser.c: parser.l +ifdef FLEX + $(FLEX) $(FLEXFLAGS) -8 -Ptsearch2_yy -o'$@' $< +else + @$(missing) flex $< $@ +endif + +SUBSYS.o: $(SUBOBJS) + $(LD) $(LDREL) $(LDOUT) $@ $^ + +EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c + +include $(top_srcdir)/contrib/contrib-global.mk +# DO NOT DELETE + + -- 2.11.0