From 45d7827f1bd1caf69daa3ce6e75abf8dfc5084f5 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 27 Nov 2008 14:15:29 +0000 Subject: [PATCH] Fix problem with devdocs generation --- doc/Makefile.am | 3 +++ doc/salome/Makefile.am | 1 + doc/salome/tui/MED/doxyfile.in | 8 +++----- doc/salome/tui/Makefile.am | 29 ++++++++++++++--------------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 52350de3c..bf1dace58 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -22,3 +22,6 @@ SUBDIRS= MEDMEM salome EXTRA_DIST= html + +dev_docs: + (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index d0d88709e..b4db939bd 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -24,6 +24,7 @@ # Date : 30/11/2001 # $Header$ # +SUBDIRS= tui SUBDIRSTUI= tui dev_docs: diff --git a/doc/salome/tui/MED/doxyfile.in b/doc/salome/tui/MED/doxyfile.in index d04558aca..15d1c2d58 100755 --- a/doc/salome/tui/MED/doxyfile.in +++ b/doc/salome/tui/MED/doxyfile.in @@ -37,8 +37,7 @@ ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = ../../../share/salome \ - ../../../build/salome +STRIP_FROM_PATH = @top_srcdir@ @top_builddir@ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES @@ -93,9 +92,8 @@ WARN_LOGFILE = log.txt #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../../../share/salome/src \ - ../../../share/salome/idl \ - ../../../build/salome/bin +INPUT = @top_srcdir@/src \ + @top_srcdir@/idl FILE_PATTERNS = *.idl *.h *.hh *.hxx *.c *.cc *.cxx *.ixx *.jxx python_extension_must_be_here RECURSIVE = YES EXCLUDE = diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index fa50504a7..df4fbc66c 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -22,35 +22,34 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = MED -#EXTRA_DIST+= MED dev_docs: cp -fr $(srcdir)/MED ./INPUT; \ cp -fr ./MED/doxyfile ./INPUT; \ - cp -fr ./MED/sources/static/tree.js ./INPUT/sources/static; \ cd INPUT; \ - sed 's|../../../share/salome|$(top_srcdir)|' ./doxyfile > ./doxyfile1; \ - sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ - sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - $(DOXYGEN) -u ./doxyfile1; \ + sed 's|python_extension_must_be_here|*.py|' doxyfile > doxyfile1; \ else \ - sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ + sed 's|python_extension_must_be_here||' doxyfile > doxyfile1; \ fi; \ mv -f doxyfile1 doxyfile; \ - $(DOXYGEN) ./doxyfile; \ + $(DOXYGEN) -u doxyfile; \ + $(DOXYGEN) doxyfile; \ cd ..; \ cp -fr $(srcdir)/MED/sources/static/*.* ./MED/ cp -fr $(srcdir)/MED/sources/ MED/ cp -fr $(srcdir)/MED/HTML/ MED/ rm -fr INPUT -#doctuidir= $(docdir)/tui/MED -#nodist_doctui_DATA= MED/doxyfile +doctuidir=$(docdir)/tui/MED -#doctuistaticdir= $(docdir)/tui/MED/sources/static -#nodist_doctuistatic_DATA= MED/sources/static/tree.js +install-data-local: + if test -d MED; then \ + $(INSTALL) -d $(docdir)/tui ; \ + cp -rp MED $(docdir)/tui ; \ + find $(docdir)/tui -name CVS -prune -exec rm -rf {} ";" ; \ + fi; + +uninstall-local: + rm -rf $(docdir)/tui/MED -- 2.39.2