diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-07-10 16:47:11 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-07-10 16:47:11 +0300 |
commit | b06fb7d30415eec1d2efb39286ab96070c724fd4 (patch) | |
tree | 1c54b5707600d03d243c1e5c8a81a759345296d0 | |
parent | babd5c07d02cd240c8d0e01bdf2edfbef0c5774e (diff) | |
download | grecs-b06fb7d30415eec1d2efb39286ab96070c724fd4.tar.gz grecs-b06fb7d30415eec1d2efb39286ab96070c724fd4.tar.bz2 |
Distribute only needed parts of wordsplit
* Makefile.am (WORDSPLIT_SRC)
(WORDSPLIT_TEST,WORDSPLIT_DOC): New variables.
(EXTRA_DIST): Add WORDSPLIT_SRC (unconditionally) and @GRECS_EXTRA_DIST@
(gets set depending on whether docs and testsuite is required).
* am/grecs.m4: Set GRECS_EXTRA_DIST to $(WORDSPLIT_TEST) if testsuite
is required. Append to it $(WORDSPLIT_DOC) if documentation is
required as well.
-rw-r--r-- | Makefile.am | 9 | ||||
-rw-r--r-- | am/grecs.m4 | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b8482a1..38c8782 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -16,9 +16,14 @@ | |||
16 | 16 | ||
17 | ACLOCAL_AMFLAGS = -I am | 17 | ACLOCAL_AMFLAGS = -I am |
18 | SUBDIRS=. include src @GRECS_TESTDIR@ @GRECS_DOCDIR@ | 18 | SUBDIRS=. include src @GRECS_TESTDIR@ @GRECS_DOCDIR@ |
19 | |||
20 | # Wordsplit components. | ||
21 | WORDSPLIT_SRC = wordsplit/wordsplit.c wordsplit/wordsplit.h | ||
22 | WORDSPLIT_TEST = wordsplit/wordsplit.at wordsplit/wsp.c | ||
23 | WORDSPLIT_DOC = wordsplit/wordsplit.3 | ||
24 | |||
19 | EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h\ | 25 | EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h\ |
20 | wordsplit/wordsplit.c wordsplit/wordsplit.h wordsplit/wordsplit.3 \ | 26 | $(WORDSPLIT_SRC) @GRECS_EXTRA_DIST@ |
21 | wordsplit/wordsplit.at wordsplit/wsp.c | ||
22 | 27 | ||
23 | noinst_HEADERS = gitid.h | 28 | noinst_HEADERS = gitid.h |
24 | BUILT_SOURCES = gitid.h README | 29 | BUILT_SOURCES = gitid.h README |
diff --git a/am/grecs.m4 b/am/grecs.m4 index 8bf3d21..f453079 100644 --- a/am/grecs.m4 +++ b/am/grecs.m4 | |||
@@ -155,6 +155,7 @@ AC_DEFUN([GRECS_SETUP],[ | |||
155 | m4_popdef([TESTDIR]) | 155 | m4_popdef([TESTDIR]) |
156 | AM_MISSING_PROG([AUTOM4TE], [autom4te]) | 156 | AM_MISSING_PROG([AUTOM4TE], [autom4te]) |
157 | GRECS_TESTDIR=tests | 157 | GRECS_TESTDIR=tests |
158 | GRECS_EXTRA_DIST='$(WORDSPLIT_TEST)' | ||
158 | ]) | 159 | ]) |
159 | _GRECS_IF_OPTION_SET([getopt],[ | 160 | _GRECS_IF_OPTION_SET([getopt],[ |
160 | AC_CHECK_HEADERS([getopt.h]) | 161 | AC_CHECK_HEADERS([getopt.h]) |
@@ -197,6 +198,7 @@ AC_DEFUN([GRECS_SETUP],[ | |||
197 | AC_SUBST([GRECS_BUILD_AUX]) | 198 | AC_SUBST([GRECS_BUILD_AUX]) |
198 | AC_SUBST([GRECS_INCLUDES]) | 199 | AC_SUBST([GRECS_INCLUDES]) |
199 | AC_SUBST([GRECS_TESTDIR]) | 200 | AC_SUBST([GRECS_TESTDIR]) |
201 | AC_SUBST([GRECS_EXTRA_DIST]) | ||
200 | AC_SUBST([GRECS_LDADD]) | 202 | AC_SUBST([GRECS_LDADD]) |
201 | AC_SUBST([GRECS_DOCDIR]) | 203 | AC_SUBST([GRECS_DOCDIR]) |
202 | AC_SUBST([GRECS_CHANGELOG]) | 204 | AC_SUBST([GRECS_CHANGELOG]) |
@@ -213,6 +215,7 @@ AC_DEFUN([GRECS_SETUP],[ | |||
213 | GRECS_BUILD_TYPE=install | 215 | GRECS_BUILD_TYPE=install |
214 | GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la'] | 216 | GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la'] |
215 | GRECS_DOCDIR='doc' | 217 | GRECS_DOCDIR='doc' |
218 | GRECS_EXTRA_DIST="${GRECS_EXTRA_DIST}${GRECS_EXTRA_DIST:+ }\$(WORDSPLIT_DOC)" | ||
216 | GRECS_CHANGELOG= | 219 | GRECS_CHANGELOG= |
217 | GRECS_DISTCK_AT=distck.at | 220 | GRECS_DISTCK_AT=distck.at |
218 | GRECS_README=README.standalone | 221 | GRECS_README=README.standalone |