Skip to content

Commit

Permalink
Merge pull request universal-ctags#2270 from k-takata/extra-dist
Browse files Browse the repository at this point in the history
buildsys: Add some more files to EXTRA_DIST
  • Loading branch information
k-takata authored Oct 29, 2019
2 parents d085a02 + 7aadb35 commit 2490479
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 3 deletions.
10 changes: 9 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
include $(top_srcdir)/source.mak

# Test cases are added to EXTRA_DIST in makefiles/test-cases.mak
# Test cases are added to EXTRA_DIST by makefiles under Tmain and Units
# Documents are added to EXTRA_DIST by makefiles/docs.mak
EXTRA_DIST = README.md autogen.sh \
makefiles/list-optlib2c-input.mak misc/optlib2c \
.ctags.d/exclusion.ctags .dir-locals.el .editorconfig .gdbinit .gitignore \
.indent.pro .uncrustify.cfg \
gnu_regex/README.txt gnu_regex/regcomp.c gnu_regex/regexec.c \
gnu_regex/regex_internal.c gnu_regex/regex_internal.h \
misc/ctags-optlib-mode.el \
misc/mk-interactive-request.sh misc/roundtrip misc/tinst \
misc/packcc/.gitignore misc/packcc/LICENSE.txt \
misc/packcc/README.md \
misc/validators/validator-jq \
misc/validators/validator-KNOWN-INVALIDATION \
misc/validators/validator-NONE \
misc/validators/validator-puppet \
$(WIN32_HEADS) $(WIN32_SRCS) mk_mingw.mak mk_mvc.mak \
win32/mkstemp/COPYING.MinGW-w64-runtime.txt \
win32/ctags_vs2013.sln \
Expand Down Expand Up @@ -177,6 +184,7 @@ uninstall-hook:
rm $(DESTDIR)$(bindir)/etags$(EXEEXT)
endif

include $(top_srcdir)/makefiles/docs.mak
include $(top_srcdir)/makefiles/testing.mak

include $(top_srcdir)/makefiles/help.mak
Expand Down
5 changes: 3 additions & 2 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ fi

ctags_files=`${MAKE} -s -f makefiles/list-optlib2c-input.mak`
misc/dist-test-cases && \
if autoreconf -vfi; then
misc/dist-docs && \
if autoreconf -vfi; then
if type perl > /dev/null; then
for i in ${ctags_files}; do
o=${i%.ctags}.c
Expand All @@ -37,6 +38,6 @@ misc/dist-test-cases && \
else
echo "failed in running autoreconf" 1>&2
exit 1
fi
fi

exit $?
57 changes: 57 additions & 0 deletions makefiles/docs.mak
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# -*- makefile -*-
# Generated by misc/dist-docs

EXTRA_DIST += docs/Makefile
EXTRA_DIST += docs/README.md
EXTRA_DIST += docs/area-and-parsers.svg
EXTRA_DIST += docs/autotools.rst
EXTRA_DIST += docs/building.rst
EXTRA_DIST += docs/chop.rst
EXTRA_DIST += docs/conf.py
EXTRA_DIST += docs/contributions.rst
EXTRA_DIST += docs/cspell.rst
EXTRA_DIST += docs/developers.rst
EXTRA_DIST += docs/development-process.rst
EXTRA_DIST += docs/extending.rst
EXTRA_DIST += docs/guessing.rst
EXTRA_DIST += docs/index.rst
EXTRA_DIST += docs/input-text-stream.svg
EXTRA_DIST += docs/input-validation.rst
EXTRA_DIST += docs/interactive-mode.rst
EXTRA_DIST += docs/internal.rst
EXTRA_DIST += docs/man-pages.rst
EXTRA_DIST += docs/man/ctags-incompatibilities.7.rst
EXTRA_DIST += docs/man/ctags-optlib.7.rst
EXTRA_DIST += docs/man/ctags.1.rst
EXTRA_DIST += docs/man/tags.5.rst
EXTRA_DIST += docs/news.rst
EXTRA_DIST += docs/noise.rst
EXTRA_DIST += docs/optlib.rst
EXTRA_DIST += docs/osx.rst
EXTRA_DIST += docs/other-projects.rst
EXTRA_DIST += docs/output-format.rst
EXTRA_DIST += docs/output-json.rst
EXTRA_DIST += docs/output-tag-stream.svg
EXTRA_DIST += docs/output-xref.rst
EXTRA_DIST += docs/parser-asm.rst
EXTRA_DIST += docs/parser-cmake.rst
EXTRA_DIST += docs/parser-cxx.rst
EXTRA_DIST += docs/parser-html.rst
EXTRA_DIST += docs/parser-puppetManifest.rst
EXTRA_DIST += docs/parser-python.rst
EXTRA_DIST += docs/parser-tcl.rst
EXTRA_DIST += docs/parser-vim.rst
EXTRA_DIST += docs/parser-xslt.rst
EXTRA_DIST += docs/parsers.rst
EXTRA_DIST += docs/promise.svg
EXTRA_DIST += docs/reporting.rst
EXTRA_DIST += docs/running-multi-parsers.rst
EXTRA_DIST += docs/semifuzz.rst
EXTRA_DIST += docs/stack-and-parsers.svg
EXTRA_DIST += docs/testing.rst
EXTRA_DIST += docs/tinst.rst
EXTRA_DIST += docs/tips.rst
EXTRA_DIST += docs/tmain.rst
EXTRA_DIST += docs/tracking.rst
EXTRA_DIST += docs/units.rst
EXTRA_DIST += docs/windows.rst
27 changes: 27 additions & 0 deletions misc/dist-docs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/sh

# dist-docs --- Generate list of EXTRA_DIST for docs directory
#
# COPYRIGHT NOTICE SHOULD BE HERE
#

print_make_header()
{
echo "# -*- makefile -*-"
echo "# Generated by $0"
echo
}

make_with_git ()
{
git_top=$1
sub_f=

print_make_header

for sub_f in $(git ls-files ${git_top}); do
echo "EXTRA_DIST +=" "${sub_f}"
done
}

make_with_git docs > makefiles/docs.mak

0 comments on commit 2490479

Please sign in to comment.