Change in ...libosmocore[master]: Makefile.am: don't delete example.xml, vtydoc.xsd

osmith gerrit-no-reply at lists.osmocom.org
Fri Jun 28 07:25:51 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/14626


Change subject: Makefile.am: don't delete example.xml, vtydoc.xsd
......................................................................

Makefile.am: don't delete example.xml, vtydoc.xsd

Do not remove the entire doc/vty/ dir during the doxygen generation,
because it contains versioned files. Fix a regression from
Ib03d0b70d536c8f1386def666c89106a840f7363.

Related: OS#3986
Change-Id: I884398c5e834ae2fac0af8c9b52d65bb3ceacb2d
---
M Makefile.am
1 file changed, 4 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/14626/1

diff --git a/Makefile.am b/Makefile.am
index 332ce65..2e73f72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,10 +79,11 @@
 	-$(DOXYGEN) $(top_builddir)/Doxyfile.gsm
 	touch "$@"
 
+# Don't delete the entire doc/vty, it contains example.xml and vtydoc.xsd (OS#3986)
 $(top_builddir)/doc/libosmovty.tag.prep: $(top_builddir)/Doxyfile.vty \
 		$(top_srcdir)/include/osmocom/vty/*.h \
 		$(top_srcdir)/src/vty/*.c
-	rm -rf $(top_builddir)/doc/vty; mkdir -p $(top_builddir)/doc/vty
+	rm -rf $(top_builddir)/doc/vty/html $(top_builddir)/doc/vty/latex
 	rm -rf $(top_builddir)/doc/libosmovty.map
 	-$(DOXYGEN) $(top_builddir)/Doxyfile.vty
 	touch "$@"
@@ -151,6 +152,7 @@
 	rm -rf $(top_builddir)/doc/gsm; mkdir -p $(top_builddir)/doc/gsm
 	$(DOXYGEN) Doxyfile.gsm
 
+# Don't delete the entire doc/vty, it contains example.xml and vtydoc.xsd (OS#3986)
 $(top_builddir)/doc/vty/html/index.html: $(top_builddir)/doc/libosmovty.tag.prep \
 		$(top_builddir)/doc/libosmocore.tag.prep \
 		$(top_builddir)/doc/libosmogsm.tag.prep \
@@ -158,7 +160,7 @@
 		$(top_builddir)/doc/libosmocoding.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
 		$(top_builddir)/doc/libosmogb.tag.prep
-	rm -rf $(top_builddir)/doc/vty; mkdir -p $(top_builddir)/doc/vty
+	rm -rf $(top_builddir)/doc/vty/html $(top_builddir)/doc/vty/latex
 	$(DOXYGEN) Doxyfile.vty
 
 $(top_builddir)/doc/codec/html/index.html: $(top_builddir)/doc/libosmocodec.tag.prep \

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I884398c5e834ae2fac0af8c9b52d65bb3ceacb2d
Gerrit-Change-Number: 14626
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190628/f0dc3070/attachment.html>


More information about the gerrit-log mailing list