Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d6f0f44

Browse files
committed
make sub-Makefiles in the sub-directories
1 parent 8405e50 commit d6f0f44

File tree

4 files changed

+86
-12
lines changed

4 files changed

+86
-12
lines changed

contrib/tsearch2/Makefile

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,26 @@ override CPPFLAGS := -I. -I./snowball -I./ispell -I./wordparser $(CPPFLAGS)
77

88
MODULE_big = tsearch2
99
OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
10-
snowball/english_stem.o snowball/api.o snowball/russian_stem.o snowball/utilities.o \
11-
dict_snowball.o ispell/spell.o dict_ispell.o dict_syn.o \
12-
wparser.o wordparser/parser.o wordparser/deflex.o wparser_def.o \
10+
dict_snowball.o dict_ispell.o dict_syn.o \
11+
wparser.o wparser_def.o \
1312
ts_cfg.o tsvector.o rewrite.o crc32.o query.o gistidx.o \
1413
tsvector_op.o rank.o ts_stat.o
1514

15+
SUBDIRS := snowball ispell wordparser
16+
SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)
17+
18+
OBJS:= $(OBJS) $(SUBDIROBJS)
19+
20+
$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
21+
22+
$(SUBDIRS:%=%-recursive):
23+
$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
24+
1625
DATA_built = tsearch2.sql untsearch2.sql
1726
DOCS = README.tsearch2
1827
REGRESS = tsearch2
1928

20-
wordparser/parser.c: wordparser/parser.l
21-
ifdef FLEX
22-
$(FLEX) $(FLEXFLAGS) -8 -Ptsearch2_yy -o'$@' $<
23-
else
24-
@$(missing) flex $< $@
25-
endif
26-
27-
EXTRA_CLEAN = wordparser/parser.c tsearch2.sql.in
29+
EXTRA_CLEAN = tsearch2.sql.in
2830

2931
SHLIB_LINK := -lm
3032
include $(top_srcdir)/contrib/contrib-global.mk
@@ -40,5 +42,10 @@ tsearch2.sql.in: tsearch.sql._in
4042
sed 's,DATA_PATH,$(datadir),g' < $< > $@
4143

4244
untsearch2.sql: untsearch.sql.in
43-
cp $< $@
45+
cp $< $@
46+
47+
clean: subclean
4448

49+
subclean:
50+
for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done
51+

contrib/tsearch2/ispell/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
subdir = contrib/tsearch2/ispell
2+
top_builddir = ../../..
3+
include $(top_builddir)/src/Makefile.global
4+
5+
6+
override CPPFLAGS := -I. -I.. $(CPPFLAGS)
7+
8+
SUBOBJS = spell.o
9+
10+
all: SUBSYS.o
11+
12+
SUBSYS.o: $(SUBOBJS)
13+
$(LD) $(LDREL) $(LDOUT) $@ $^
14+
15+
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
16+
17+
include $(top_srcdir)/contrib/contrib-global.mk
18+
# DO NOT DELETE
19+
20+

contrib/tsearch2/snowball/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
subdir = contrib/tsearch2/snowball
2+
top_builddir = ../../..
3+
include $(top_builddir)/src/Makefile.global
4+
5+
6+
override CPPFLAGS := -I. -I.. $(CPPFLAGS)
7+
8+
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
9+
10+
all: SUBSYS.o
11+
12+
SUBSYS.o: $(SUBOBJS)
13+
$(LD) $(LDREL) $(LDOUT) $@ $^
14+
15+
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
16+
17+
include $(top_srcdir)/contrib/contrib-global.mk
18+
# DO NOT DELETE
19+
20+

contrib/tsearch2/wordparser/Makefile

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
subdir = contrib/tsearch2/wordparser
2+
top_builddir = ../../..
3+
include $(top_builddir)/src/Makefile.global
4+
5+
6+
override CPPFLAGS := -I. -I.. $(CPPFLAGS)
7+
8+
SUBOBJS = parser.o deflex.o
9+
10+
all: SUBSYS.o
11+
12+
parser.c: parser.l
13+
ifdef FLEX
14+
$(FLEX) $(FLEXFLAGS) -8 -Ptsearch2_yy -o'$@' $<
15+
else
16+
@$(missing) flex $< $@
17+
endif
18+
19+
SUBSYS.o: $(SUBOBJS)
20+
$(LD) $(LDREL) $(LDOUT) $@ $^
21+
22+
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
23+
24+
include $(top_srcdir)/contrib/contrib-global.mk
25+
# DO NOT DELETE
26+
27+

0 commit comments

Comments
 (0)