From 316d1e1b7bbe4c6d1c9b6adbd27ecba3b20f3743 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 28 Jun 2019 09:13:22 +0200 Subject: 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. Fixes: 2fe50ac9511469a587426b80501b2b5da770e3a0 ("doxygen: enable cross referencing everywhere") Related: OS#3986 Change-Id: I884398c5e834ae2fac0af8c9b52d65bb3ceacb2d --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 332ce653..2e73f72e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,10 +79,11 @@ $(top_builddir)/doc/libosmogsm.tag.prep: $(top_builddir)/Doxyfile.gsm \ -$(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 @@ $(top_builddir)/doc/gsm/html/index.html: $(top_builddir)/doc/libosmogsm.tag.prep 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/vty/html/index.html: $(top_builddir)/doc/libosmovty.tag.prep $(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 \ -- cgit v1.2.3