diff options
| author | David M. Syzdek <david@syzdek.net> | 2023-01-26 17:02:39 -0900 |
|---|---|---|
| committer | David M. Syzdek <david@syzdek.net> | 2023-01-26 17:03:55 -0900 |
| commit | 5a047542933ee74b689243247b2d27b594efc419 (patch) | |
| tree | 912c901c8630c5446ee074f8b56df507fc514159 | |
| parent | 911f0425600a5e37edce4e50d2695fb9a33e602c (diff) | |
| download | ldap-utils-5a047542933ee74b689243247b2d27b594efc419.tar.gz ldap-utils-5a047542933ee74b689243247b2d27b594efc419.tar.bz2 ldap-utils-5a047542933ee74b689243247b2d27b594efc419.tar.xz ldap-utils-5a047542933ee74b689243247b2d27b594efc419.zip | |
autotools: removing doxygen targets
| -rw-r--r-- | ChangeLog.md | 1 | ||||
| -rw-r--r-- | Makefile.am | 35 | ||||
| -rw-r--r-- | acinclude.m4 | 29 | ||||
| -rw-r--r-- | 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 <david@syzdek.net> | |||
| 9 | Not yet released. | 9 | Not yet released. |
| 10 | - ldapinfo: fixing management of listeners branch in monitor context (syzdek) | 10 | - ldapinfo: fixing management of listeners branch in monitor context (syzdek) |
| 11 | - ldapconns: adding program (syzdek) | 11 | - ldapconns: adding program (syzdek) |
| 12 | - docs: removing doxygen targets (syzdek) | ||
| 12 | 13 | ||
| 13 | 0.5 | 14 | 0.5 |
| 14 | --- | 15 | --- |
diff --git a/Makefile.am b/Makefile.am index 36dcd5f..c4e8953 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -39,10 +39,6 @@ SUBDIRS = $(subdirs) | |||
| 39 | DIST_SUBDIRS = $(subdirs) | 39 | DIST_SUBDIRS = $(subdirs) |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | # directory locations | ||
| 43 | doxygendir = $(docdir)/doxygen | ||
| 44 | |||
| 45 | |||
| 46 | # GNU make options | 42 | # GNU make options |
| 47 | V = 0 | 43 | V = 0 |
| 48 | 44 | ||
| @@ -77,7 +73,6 @@ LDADD = | |||
| 77 | bin_PROGRAMS = | 73 | bin_PROGRAMS = |
| 78 | check_PROGRAMS = | 74 | check_PROGRAMS = |
| 79 | doc_DATA = doc/oid.txt | 75 | doc_DATA = doc/oid.txt |
| 80 | doxygen_DATA = | ||
| 81 | noinst_DATA = | 76 | noinst_DATA = |
| 82 | EXTRA_PROGRAMS = | 77 | EXTRA_PROGRAMS = |
| 83 | include_HEADERS = | 78 | include_HEADERS = |
| @@ -135,9 +130,6 @@ CLEANFILES = \ | |||
| 135 | $(builddir)/a.out $(srcdir)/a.out \ | 130 | $(builddir)/a.out $(srcdir)/a.out \ |
| 136 | $(builddir)/*/a.out $(srcdir)/*/a.out \ | 131 | $(builddir)/*/a.out $(srcdir)/*/a.out \ |
| 137 | config.h.in~ $(srcdir)/config.h.in~ \ | 132 | config.h.in~ $(srcdir)/config.h.in~ \ |
| 138 | doc/Doxyfile \ | ||
| 139 | doc/Doxyfile.make \ | ||
| 140 | doc/doxygen \ | ||
| 141 | $(man_MANS) \ | 133 | $(man_MANS) \ |
| 142 | $(pkgdata_DATA) \ | 134 | $(pkgdata_DATA) \ |
| 143 | $(bin_SCRIPTS) \ | 135 | $(bin_SCRIPTS) \ |
| @@ -146,18 +138,11 @@ CLEANFILES = \ | |||
| 146 | @PACKAGE_TARNAME@-*.txz \ | 138 | @PACKAGE_TARNAME@-*.txz \ |
| 147 | @PACKAGE_TARNAME@-*.zip | 139 | @PACKAGE_TARNAME@-*.zip |
| 148 | DISTCHECK_CONFIGURE_FLAGS = --enable-strictwarnings \ | 140 | DISTCHECK_CONFIGURE_FLAGS = --enable-strictwarnings \ |
| 149 | --enable-doxygen-docs \ | ||
| 150 | --enable-ldapdebug \ | 141 | --enable-ldapdebug \ |
| 151 | --enable-ldapschema \ | 142 | --enable-ldapschema \ |
| 152 | --enable-libldapschema | 143 | --enable-libldapschema |
| 153 | 144 | ||
| 154 | 145 | ||
| 155 | # macros for doc/doxygen | ||
| 156 | if LDAPUTILS_DOXYGEN | ||
| 157 | noinst_DATA += doc/doxygen/html/index.html | ||
| 158 | endif | ||
| 159 | |||
| 160 | |||
| 161 | # macros for lib/libldapschema.a | 146 | # macros for lib/libldapschema.a |
| 162 | if LDAPUTILS_LIBLDAPSCHEMA | 147 | if LDAPUTILS_LIBLDAPSCHEMA |
| 163 | noinst_LIBRARIES += lib/libldapschema.a | 148 | noinst_LIBRARIES += lib/libldapschema.a |
| @@ -379,24 +364,10 @@ MY_V_OIDSPEC = $(my__v_OIDSPEC_$(V)) | |||
| 379 | my__v_OIDSPEC_ = | 364 | my__v_OIDSPEC_ = |
| 380 | my__v_OIDSPEC_0 = @echo " OIDSPEC " $@; | 365 | my__v_OIDSPEC_0 = @echo " OIDSPEC " $@; |
| 381 | my__v_OIDSPEC_1 = | 366 | my__v_OIDSPEC_1 = |
| 382 | MY_V_DOXYGEN = $(my__v_DOXYGEN_$(V)) | ||
| 383 | my__v_DOXYGEN_ = | ||
| 384 | my__v_DOXYGEN_0 = @echo " DOXYGEN " $@; | ||
| 385 | my__v_DOXYGEN_1 = | ||
| 386 | 367 | ||
| 387 | # custom targets | ||
| 388 | .PHONY: doxygen | ||
| 389 | |||
| 390 | doxygen: doc/doxygen/html/index.html | ||
| 391 | 368 | ||
| 392 | doc/doxygen/html/index.html: doc/Doxyfile $(noinst_HEADERS) $(include_HEADERS) | 369 | # custom targets |
| 393 | $(MY_V_DOXYGEN) rm -fR doc/doxygen; mkdir -p doc/doxygen; \ | 370 | .PHONY: |
| 394 | cd $(top_srcdir); \ | ||
| 395 | $(DOXYGEN) $(abs_top_builddir)/doc/Doxyfile > /dev/null; | ||
| 396 | |||
| 397 | doc/Doxyfile: Makefile doc/Doxyfile.in | ||
| 398 | $(MY_V_DOXYGEN)$(DOXYGEN) -u $(srcdir)/doc/Doxyfile.in > /dev/null; | ||
| 399 | @$(do_subst_dt); | ||
| 400 | 371 | ||
| 401 | doc/ldap2csv.1: Makefile $(srcdir)/doc/ldap2csv.1.in | 372 | doc/ldap2csv.1: Makefile $(srcdir)/doc/ldap2csv.1.in |
| 402 | @$(do_subst_dt) | 373 | @$(do_subst_dt) |
| @@ -438,8 +409,6 @@ install-data-hook: | |||
| 438 | uninstall-local: | 409 | uninstall-local: |
| 439 | 410 | ||
| 440 | clean-local: | 411 | clean-local: |
| 441 | rm -fR $(builddir)/doc/doxygen | ||
| 442 | rm -fR $(srcdir)/doc/doxygen | ||
| 443 | 412 | ||
| 444 | distclean-local: | 413 | distclean-local: |
| 445 | rm -fR $(srcdir)/autom4te.cache | 414 | 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 @@ | |||
| 32 | # acinclude.m4 - custom m4 macros used by configure.ac | 32 | # acinclude.m4 - custom m4 macros used by configure.ac |
| 33 | # | 33 | # |
| 34 | 34 | ||
| 35 | # AC_LDAP_UTILS_DOXYGEN | ||
| 36 | # ______________________________________________________________________________ | ||
| 37 | AC_DEFUN_ONCE([AC_LDAP_UTILS_DOXYGEN],[dnl | ||
| 38 | |||
| 39 | # prerequists | ||
| 40 | AC_REQUIRE([AC_BINDLE_WITH_DOXYGEN]) | ||
| 41 | |||
| 42 | enableval="" | ||
| 43 | AC_ARG_ENABLE( | ||
| 44 | doxygen-docs, | ||
| 45 | [AS_HELP_STRING([--enable-doxygen-docs], [enable Doxygen documentation])], | ||
| 46 | [ EDOXYGEN=$enableval ], | ||
| 47 | [ EDOXYGEN=$enableval ] | ||
| 48 | ) | ||
| 49 | |||
| 50 | if test "x${EDOXYGEN}" != "xyes";then | ||
| 51 | EDOXYGEN="no" | ||
| 52 | fi | ||
| 53 | LDAPUTILS_DOXYGEN=${EDOXYGEN} | ||
| 54 | |||
| 55 | LDAPUTILS_DOXYGEN_STATUS="skip" | ||
| 56 | if test "x${EDOXYGEN}" == "xyes";then | ||
| 57 | LDAPUTILS_DOXYGEN_STATUS="build" | ||
| 58 | fi | ||
| 59 | |||
| 60 | AM_CONDITIONAL([LDAPUTILS_DOXYGEN], [test "x$LDAPUTILS_DOXYGEN" = "xyes"]) | ||
| 61 | ])dnl | ||
| 62 | |||
| 63 | |||
| 64 | # AC_LDAP_UTILS_LDAP2CSV | 35 | # AC_LDAP_UTILS_LDAP2CSV |
| 65 | # ______________________________________________________________________________ | 36 | # ______________________________________________________________________________ |
| 66 | AC_DEFUN_ONCE([AC_LDAP_UTILS_LDAP2CSV],[dnl | 37 | 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 | |||
| 193 | 193 | ||
| 194 | # custom configure options | 194 | # custom configure options |
| 195 | AC_BINDLE_ENABLE_WARNINGS([-Wno-padded -Wno-unknown-pragmas], [-Wpadded]) | 195 | AC_BINDLE_ENABLE_WARNINGS([-Wno-padded -Wno-unknown-pragmas], [-Wpadded]) |
| 196 | AC_LDAP_UTILS_DOXYGEN | ||
| 197 | AC_LDAP_UTILS_UTILITIES | 196 | AC_LDAP_UTILS_UTILITIES |
| 198 | AC_LDAP_UTILS_LIBRARIES | 197 | AC_LDAP_UTILS_LIBRARIES |
| 199 | AC_LDAP_UTILS_LIBLDAPSCHEMA | 198 | AC_LDAP_UTILS_LIBLDAPSCHEMA |
| @@ -219,9 +218,6 @@ AC_MSG_NOTICE([ ]) | |||
| 219 | AC_MSG_NOTICE([ Use Warnings $USE_WARNINGS]) | 218 | AC_MSG_NOTICE([ Use Warnings $USE_WARNINGS]) |
| 220 | AC_MSG_NOTICE([ Use Strict Warnings $USE_STRICTWARNINGS]) | 219 | AC_MSG_NOTICE([ Use Strict Warnings $USE_STRICTWARNINGS]) |
| 221 | AC_MSG_NOTICE([ ]) | 220 | AC_MSG_NOTICE([ ]) |
| 222 | AC_MSG_NOTICE([ Documentation:]) | ||
| 223 | AC_MSG_NOTICE([ Doxygen docs $LDAPUTILS_DOXYGEN_STATUS]) | ||
| 224 | AC_MSG_NOTICE([ ]) | ||
| 225 | AC_MSG_NOTICE([ Libraries:]) | 221 | AC_MSG_NOTICE([ Libraries:]) |
| 226 | AC_MSG_NOTICE([ libldapschema.a $LDAPUTILS_LIBLDAPSCHEMA_STATUS]) | 222 | AC_MSG_NOTICE([ libldapschema.a $LDAPUTILS_LIBLDAPSCHEMA_STATUS]) |
| 227 | AC_MSG_NOTICE([ libldapschema.la $LDAPUTILS_LTLIBLDAPSCHEMA_STATUS]) | 223 | AC_MSG_NOTICE([ libldapschema.la $LDAPUTILS_LTLIBLDAPSCHEMA_STATUS]) |
