From 5a047542933ee74b689243247b2d27b594efc419 Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Thu, 26 Jan 2023 17:02:39 -0900 Subject: autotools: removing doxygen targets --- ChangeLog.md | 1 + Makefile.am | 35 ++--------------------------------- acinclude.m4 | 29 ----------------------------- configure.ac | 4 ---- 4 files changed, 3 insertions(+), 66 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index a7cf0da..61ead29 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,7 @@ Copyright (C) 2012, 2019 David M. Syzdek Not yet released. - ldapinfo: fixing management of listeners branch in monitor context (syzdek) - ldapconns: adding program (syzdek) + - docs: removing doxygen targets (syzdek) 0.5 --- diff --git a/Makefile.am b/Makefile.am index 36dcd5f..c4e8953 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,10 +39,6 @@ SUBDIRS = $(subdirs) DIST_SUBDIRS = $(subdirs) -# directory locations -doxygendir = $(docdir)/doxygen - - # GNU make options V = 0 @@ -77,7 +73,6 @@ LDADD = bin_PROGRAMS = check_PROGRAMS = doc_DATA = doc/oid.txt -doxygen_DATA = noinst_DATA = EXTRA_PROGRAMS = include_HEADERS = @@ -135,9 +130,6 @@ CLEANFILES = \ $(builddir)/a.out $(srcdir)/a.out \ $(builddir)/*/a.out $(srcdir)/*/a.out \ config.h.in~ $(srcdir)/config.h.in~ \ - doc/Doxyfile \ - doc/Doxyfile.make \ - doc/doxygen \ $(man_MANS) \ $(pkgdata_DATA) \ $(bin_SCRIPTS) \ @@ -146,18 +138,11 @@ CLEANFILES = \ @PACKAGE_TARNAME@-*.txz \ @PACKAGE_TARNAME@-*.zip DISTCHECK_CONFIGURE_FLAGS = --enable-strictwarnings \ - --enable-doxygen-docs \ --enable-ldapdebug \ --enable-ldapschema \ --enable-libldapschema -# macros for doc/doxygen -if LDAPUTILS_DOXYGEN - noinst_DATA += doc/doxygen/html/index.html -endif - - # macros for lib/libldapschema.a if LDAPUTILS_LIBLDAPSCHEMA noinst_LIBRARIES += lib/libldapschema.a @@ -379,24 +364,10 @@ MY_V_OIDSPEC = $(my__v_OIDSPEC_$(V)) my__v_OIDSPEC_ = my__v_OIDSPEC_0 = @echo " OIDSPEC " $@; my__v_OIDSPEC_1 = -MY_V_DOXYGEN = $(my__v_DOXYGEN_$(V)) -my__v_DOXYGEN_ = -my__v_DOXYGEN_0 = @echo " DOXYGEN " $@; -my__v_DOXYGEN_1 = -# custom targets -.PHONY: doxygen - -doxygen: doc/doxygen/html/index.html -doc/doxygen/html/index.html: doc/Doxyfile $(noinst_HEADERS) $(include_HEADERS) - $(MY_V_DOXYGEN) rm -fR doc/doxygen; mkdir -p doc/doxygen; \ - cd $(top_srcdir); \ - $(DOXYGEN) $(abs_top_builddir)/doc/Doxyfile > /dev/null; - -doc/Doxyfile: Makefile doc/Doxyfile.in - $(MY_V_DOXYGEN)$(DOXYGEN) -u $(srcdir)/doc/Doxyfile.in > /dev/null; - @$(do_subst_dt); +# custom targets +.PHONY: doc/ldap2csv.1: Makefile $(srcdir)/doc/ldap2csv.1.in @$(do_subst_dt) @@ -438,8 +409,6 @@ install-data-hook: uninstall-local: clean-local: - rm -fR $(builddir)/doc/doxygen - rm -fR $(srcdir)/doc/doxygen distclean-local: rm -fR $(srcdir)/autom4te.cache diff --git a/acinclude.m4 b/acinclude.m4 index b08c6b1..fa05573 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -32,35 +32,6 @@ # acinclude.m4 - custom m4 macros used by configure.ac # -# AC_LDAP_UTILS_DOXYGEN -# ______________________________________________________________________________ -AC_DEFUN_ONCE([AC_LDAP_UTILS_DOXYGEN],[dnl - - # prerequists - AC_REQUIRE([AC_BINDLE_WITH_DOXYGEN]) - - enableval="" - AC_ARG_ENABLE( - doxygen-docs, - [AS_HELP_STRING([--enable-doxygen-docs], [enable Doxygen documentation])], - [ EDOXYGEN=$enableval ], - [ EDOXYGEN=$enableval ] - ) - - if test "x${EDOXYGEN}" != "xyes";then - EDOXYGEN="no" - fi - LDAPUTILS_DOXYGEN=${EDOXYGEN} - - LDAPUTILS_DOXYGEN_STATUS="skip" - if test "x${EDOXYGEN}" == "xyes";then - LDAPUTILS_DOXYGEN_STATUS="build" - fi - - AM_CONDITIONAL([LDAPUTILS_DOXYGEN], [test "x$LDAPUTILS_DOXYGEN" = "xyes"]) -])dnl - - # AC_LDAP_UTILS_LDAP2CSV # ______________________________________________________________________________ AC_DEFUN_ONCE([AC_LDAP_UTILS_LDAP2CSV],[dnl diff --git a/configure.ac b/configure.ac index 8213d5a..e0743b4 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,6 @@ AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version # custom configure options AC_BINDLE_ENABLE_WARNINGS([-Wno-padded -Wno-unknown-pragmas], [-Wpadded]) -AC_LDAP_UTILS_DOXYGEN AC_LDAP_UTILS_UTILITIES AC_LDAP_UTILS_LIBRARIES AC_LDAP_UTILS_LIBLDAPSCHEMA @@ -219,9 +218,6 @@ AC_MSG_NOTICE([ ]) AC_MSG_NOTICE([ Use Warnings $USE_WARNINGS]) AC_MSG_NOTICE([ Use Strict Warnings $USE_STRICTWARNINGS]) AC_MSG_NOTICE([ ]) -AC_MSG_NOTICE([ Documentation:]) -AC_MSG_NOTICE([ Doxygen docs $LDAPUTILS_DOXYGEN_STATUS]) -AC_MSG_NOTICE([ ]) AC_MSG_NOTICE([ Libraries:]) AC_MSG_NOTICE([ libldapschema.a $LDAPUTILS_LIBLDAPSCHEMA_STATUS]) AC_MSG_NOTICE([ libldapschema.la $LDAPUTILS_LTLIBLDAPSCHEMA_STATUS]) -- cgit v1.2.3