summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-07-10 13:47:11 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-07-10 13:47:11 (GMT)
commitb06fb7d30415eec1d2efb39286ab96070c724fd4 (patch) (side-by-side diff)
tree1c54b5707600d03d243c1e5c8a81a759345296d0
parentbabd5c07d02cd240c8d0e01bdf2edfbef0c5774e (diff)
downloadgrecs-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am9
-rw-r--r--am/grecs.m43
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 @@
ACLOCAL_AMFLAGS = -I am
SUBDIRS=. include src @GRECS_TESTDIR@ @GRECS_DOCDIR@
+
+# Wordsplit components.
+WORDSPLIT_SRC = wordsplit/wordsplit.c wordsplit/wordsplit.h
+WORDSPLIT_TEST = wordsplit/wordsplit.at wordsplit/wsp.c
+WORDSPLIT_DOC = wordsplit/wordsplit.3
+
EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h\
- wordsplit/wordsplit.c wordsplit/wordsplit.h wordsplit/wordsplit.3 \
- wordsplit/wordsplit.at wordsplit/wsp.c
+ $(WORDSPLIT_SRC) @GRECS_EXTRA_DIST@
noinst_HEADERS = gitid.h
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],[
m4_popdef([TESTDIR])
AM_MISSING_PROG([AUTOM4TE], [autom4te])
GRECS_TESTDIR=tests
+ GRECS_EXTRA_DIST='$(WORDSPLIT_TEST)'
])
_GRECS_IF_OPTION_SET([getopt],[
AC_CHECK_HEADERS([getopt.h])
@@ -197,6 +198,7 @@ AC_DEFUN([GRECS_SETUP],[
AC_SUBST([GRECS_BUILD_AUX])
AC_SUBST([GRECS_INCLUDES])
AC_SUBST([GRECS_TESTDIR])
+ AC_SUBST([GRECS_EXTRA_DIST])
AC_SUBST([GRECS_LDADD])
AC_SUBST([GRECS_DOCDIR])
AC_SUBST([GRECS_CHANGELOG])
@@ -213,6 +215,7 @@ AC_DEFUN([GRECS_SETUP],[
GRECS_BUILD_TYPE=install
GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la']
GRECS_DOCDIR='doc'
+ GRECS_EXTRA_DIST="${GRECS_EXTRA_DIST}${GRECS_EXTRA_DIST:+ }\$(WORDSPLIT_DOC)"
GRECS_CHANGELOG=
GRECS_DISTCK_AT=distck.at
GRECS_README=README.standalone

Return to:

Send suggestions and report system problems to the System administrator.