Change in libosmocore[master]: doxygen: allow manual 'make apidoc' even if --disable-doxygen

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Fri Feb 1 05:17:44 UTC 2019


Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12776


Change subject: doxygen: allow manual 'make apidoc' even if --disable-doxygen
......................................................................

doxygen: allow manual 'make apidoc' even if --disable-doxygen

Even if ./configure --disable-doxygen was passed and doxygen builds are by
default skipped, provide a manual 'make apidoc' target that nevertheless
generates the API doc on the premise that a 'doxygen' program is available.

Especially since we do a two-pass doxygen build whenever any source file
changes, my guess is --disable-doxygen could be a common choice. It is then
cumbersome to have to ./configure just to get one doxygen build started.

Change-Id: If8d8dfb8365c8f28612b8ce2b8ddf88f74df9a90
---
M Makefile.am
1 file changed, 17 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/12776/1

diff --git a/Makefile.am b/Makefile.am
index 07fd666..ee3ad2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,19 +24,27 @@
 
 EXTRA_DIST = git-version-gen .version README.md osmo-release.mk osmo-release.sh
 
-if HAVE_DOXYGEN
+HTML = \
+	$(top_builddir)/doc/core/html/index.html \
+	$(top_builddir)/doc/gsm/html/index.html \
+	$(top_builddir)/doc/vty/html/index.html \
+	$(top_builddir)/doc/codec/html/index.html \
+	$(top_builddir)/doc/coding/html/index.html \
+	$(top_builddir)/doc/ctrl/html/index.html \
+	$(top_builddir)/doc/gb/html/index.html
 
+if HAVE_DOXYGEN
 html_DATA = $(top_builddir)/doc/html.tar
 
 doc: $(html_DATA)
 
-$(html_DATA): $(top_builddir)/doc/core/html/index.html \
-		  $(top_builddir)/doc/gsm/html/index.html \
-		  $(top_builddir)/doc/vty/html/index.html \
-		  $(top_builddir)/doc/codec/html/index.html \
-		  $(top_builddir)/doc/coding/html/index.html \
-		  $(top_builddir)/doc/ctrl/html/index.html \
-		  $(top_builddir)/doc/gb/html/index.html
+$(html_DATA): apidoc
+else
+DOXYGEN=doxygen
+endif
+
+.PHONY: apidoc
+apidoc: $(HTML)
 	cd $(top_builddir)/doc && tar cf html.tar */html
 
 # Support doxygen cross references from each library to each other library:
@@ -193,6 +201,7 @@
 	rm -rf $(top_builddir)/doc/gb; mkdir -p $(top_builddir)/doc/gb
 	$(DOXYGEN) Doxyfile.gb
 
+if HAVE_DOXYGEN
 install-data-hook:
 	cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar
 

-- 
To view, visit https://gerrit.osmocom.org/12776
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8d8dfb8365c8f28612b8ce2b8ddf88f74df9a90
Gerrit-Change-Number: 12776
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190201/c05bd9f0/attachment.htm>


More information about the gerrit-log mailing list