[LTP] [PATCH 7/7] docparse/Makefile: Do not abort on missing generators

Cyril Hrubis
2021-10-18T15:48:48Z

Since we want to use the metadata.json in the testrunner it must bte
build unconditionally.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
Makefile | 5 +----
docparse/Makefile | 4 ----
m4/ltp-docparse.m4 | 3 ---
3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 4e37362f9..447525e75 100644
--- a/Makefile
+++ b/Makefile
@@ -62,10 +62,7 @@ $(1):: | $$(abs_top_builddir)/$$(basename $$(subst -,.,$(1)))
endif
endef

-COMMON_TARGETS += testcases tools
-ifeq ($(WITH_METADATA),yes)
-COMMON_TARGETS += docparse
-endif
+COMMON_TARGETS += testcases tools docparse

# Don't want to nuke the original files if we're installing in-build-tree.
ifneq ($(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL))
diff --git a/docparse/Makefile b/docparse/Makefile
index e2defad38..5f2f40544 100644
--- a/docparse/Makefile
+++ b/docparse/Makefile
@@ -18,10 +18,6 @@ METADATA_GENERATOR_PARAMS := --xsltproc-opts "--stringparam toc.section.depth 1"
METADATA_GENERATOR_PARAMS_HTML := -f xhtml
METADATA_GENERATOR_PARAMS_PDF := -f pdf
METADATA_GENERATOR_PARAMS_HTML_CHUNKED := -f chunked
-else ifeq ($(METADATA_GENERATOR),)
-$(error 'METADATA_GENERATOR' not not configured, run ./configure in the root directory)
-else
-$(error '$(METADATA_GENERATOR)' not supported, only asciidoctor and asciidoc are supported)
endif

ifdef VERBOSE
diff --git a/m4/ltp-docparse.m4 b/m4/ltp-docparse.m4
index 88d2e08e4..4cdcfc071 100644
--- a/m4/ltp-docparse.m4
+++ b/m4/ltp-docparse.m4
@@ -31,7 +31,6 @@ AC_DEFUN([LTP_CHECK_METADATA_GENERATOR_ASCIIDOC], [
])

AC_DEFUN([LTP_DOCPARSE], [
-with_metadata=no
with_metadata_html=no
with_metadata_pdf=no

@@ -96,7 +95,6 @@ elif test "x$ax_perl_modules_failed" = x1; then
elif test "x$with_metadata_html" = xno -a "x$with_metadata_pdf" = xno; then
AC_MSG_WARN([$reason, $hint])
else
- with_metadata=yes
AC_SUBST(METADATA_GENERATOR, $with_metadata_generator)
if test "x$with_metadata_html" = xno -a "x$enable_metadata_html" = xyes; then
AC_MSG_WARN([HTML $reason, $hint])
@@ -106,7 +104,6 @@ else
fi
fi

-AC_SUBST(WITH_METADATA, $with_metadata)
AC_SUBST(WITH_METADATA_HTML, $with_metadata_html)
AC_SUBST(WITH_METADATA_PDF, $with_metadata_pdf)
])
--
2.32.0