build-sys: merge makefiles/*_input.mak into source.mak

universal-ctags · Aug 14, 2021 · 7905962 · 7905962
1 parent 9bda79a
commit 7905962
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 39 deletions.
diff --git a/docs/contributions.rst b/docs/contributions.rst
@@ -262,7 +262,7 @@ Build script
 To add your optlib parser, ``foo.ctags``, into ``ctags`` do the following steps;
 
 * put ``foo.ctags`` file on ``optlib/`` directory
-* add ``foo.ctags`` on ``OPTLIB2C_INPUT`` variable in ``makefiles/optlib2c_input.mak``
+* add ``foo.ctags`` on ``OPTLIB2C_INPUT`` variable in ``source.mak``
 * add ``fooParser`` on ``PARSER_LIST`` macro variable in ``main/parser_p.h``
 * add ``foo`` on the list in the section "New parsers" in ``docs/news.rst``
 * add ``"..\optlib\foo.c"`` in ``win32/ctags_vs2013.vcxproj``

diff --git a/docs/optlib.rst b/docs/optlib.rst
@@ -1760,7 +1760,7 @@ source code. Your optlib parser can thus easily become a built-in parser.
 To add your optlib file, ``foo.ctags``, into ctags do the following steps;
 
 * copy ``foo.ctags`` file on ``optlib/`` directory
-* add ``foo.ctags`` on ``OPTLIB2C_INPUT`` variable in ``makefiles/optlib2c_input.mak``
+* add ``foo.ctags`` on ``OPTLIB2C_INPUT`` variable in ``source.mak``
 * add ``fooParser`` on ``PARSER_LIST`` macro variable in ``main/parser_p.h``
 
 You are encouraged to submit your :file:`.ctags` file to our repository on

diff --git a/makefiles/optlib2c_input.mak b/makefiles/optlib2c_input.mak
diff --git a/makefiles/peg_input.mak b/makefiles/peg_input.mak
diff --git a/makefiles/txt2cstr_input.mak b/makefiles/txt2cstr_input.mak
diff --git a/source.mak b/source.mak
@@ -165,13 +165,42 @@ OPTSCRIPT_SRCS = \
 	\
 	$(NULL)
 
-include makefiles/optlib2c_input.mak
+OPTLIB2C_INPUT = \
+	optlib/RSpec.ctags			\
+	optlib/cmake.ctags			\
+	optlib/ctags-optlib.ctags		\
+	optlib/elixir.ctags			\
+	optlib/elm.ctags			\
+	optlib/gdbinit.ctags			\
+	optlib/inko.ctags			\
+	optlib/iPythonCell.ctags		\
+	optlib/kconfig.ctags			\
+	optlib/man.ctags			\
+	optlib/markdown.ctags			\
+	optlib/meson.ctags			\
+	optlib/mesonOptions.ctags		\
+	optlib/passwd.ctags			\
+	optlib/pod.ctags			\
+	optlib/puppetManifest.ctags		\
+	optlib/qemuhx.ctags			\
+	optlib/rpmMacros.ctags			\
+	optlib/scss.ctags			\
+	optlib/systemtap.ctags			\
+	\
+	$(NULL)
 OPTLIB2C_SRCS = $(OPTLIB2C_INPUT:.ctags=.c)
 
-include makefiles/txt2cstr_input.mak
+TXT2CSTR_INPUT = \
+	main/CommonPrelude.ps			\
+	\
+	$(NULL)
 TXT2CSTR_SRCS = $(TXT2CSTR_INPUT:.ps=.c)
 
-include makefiles/peg_input.mak
+PEG_INPUT = \
+       peg/varlink.peg				\
+       peg/kotlin.peg				\
+       \
+       $(NULL)
 PEG_SRCS = $(PEG_INPUT:.peg=.c)
 PEG_HEADS = $(PEG_INPUT:.peg=.h)
 PEG_EXTRA_HEADS = peg/peg_common.h $(PEG_INPUT:.peg=_pre.h) $(PEG_INPUT:.peg=_post.h)