From 4d9faf822d88c2502dedec9e02b55d143b563882 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 22 Jan 2019 14:42:10 +0100 Subject: automake: Drop manpage build support We've already thrown out the gtkdoc build support from the automake files, let's do the same with the manpages build. Acked-by: Petri Latvala Signed-off-by: Daniel Vetter --- Makefile.am | 2 +- configure.ac | 5 ----- man/Makefile.am | 45 --------------------------------------------- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 man/Makefile.am diff --git a/Makefile.am b/Makefile.am index 2ca522a0..81b66509 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = lib man tools scripts benchmarks include +SUBDIRS = lib tools scripts benchmarks include if BUILD_TESTS SUBDIRS += tests diff --git a/configure.ac b/configure.ac index e169d667..dbf056e7 100644 --- a/configure.ac +++ b/configure.ac @@ -43,10 +43,6 @@ AC_PROG_CC AC_PROG_LEX AC_PROG_YACC -# check for rst2man for generating man pages -AC_CHECK_PROG(RST2MAN, rst2man, yes, no) -AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" = xyes]) - # Checks for functions, headers, structures, etc. AC_HEADER_STDC AC_CHECK_HEADERS([termios.h linux/kd.h sys/kd.h libgen.h sys/io.h]) @@ -391,7 +387,6 @@ AC_CONFIG_FILES([ benchmarks/wsim/Makefile lib/Makefile lib/tests/Makefile - man/Makefile scripts/Makefile tests/Makefile tests/intel-ci/Makefile diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 777f5d1f..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -appmandir = $(APP_MAN_DIR) -appman_RST = \ - intel_aubdump.rst \ - intel_audio_dump.rst \ - intel_bios_dumper.rst \ - intel_error_decode.rst \ - intel_gpu_frequency.rst \ - intel_gpu_top.rst \ - intel_gtt.rst \ - intel_infoframes.rst \ - intel_lid.rst \ - intel_panel_fitter.rst \ - intel_reg.rst \ - intel_stepping.rst \ - intel_upload_blit_large.rst \ - intel_upload_blit_large_gtt.rst \ - intel_upload_blit_large_map.rst \ - intel_upload_blit_small.rst \ - intel_vbt_decode.rst - -if HAVE_RST2MAN -appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX)) -endif - -EXTRA_DIST = \ - $(appman_RST) \ - defs.rst.in \ - meson.build \ - rst2man.sh \ - $(NULL) - -CLEANFILES = $(appman_DATA) defs.rst - -SUFFIXES = .$(APP_MAN_SUFFIX) - -# create some definitions useful in the man page rst sources -defs.rst: - $(AM_V_GEN)echo ".. |PACKAGE_NAME| replace:: $(PACKAGE_NAME)" > $@ - $(AM_V_GEN)echo ".. |PACKAGE_VERSION| replace:: $(PACKAGE_VERSION)" >> $@ - $(AM_V_GEN)echo ".. |PACKAGE_STRING| replace:: $(PACKAGE_STRING)" >> $@ - $(AM_V_GEN)echo ".. |MANUAL_SECTION| replace:: 1" >> $@ - $(AM_V_GEN)echo ".. |MANUAL_GROUP| replace:: General Commands Manual" >> $@ - -%.$(APP_MAN_SUFFIX): %.rst defs.rst - $(AM_V_GEN)rst2man < $< > $@ -- cgit v1.2.3