Do not include pregenerated reference documentation in source package…

… and move documentation generation from autogen.sh to Makefile
Qalculate · Jan 24, 2020 · 474b120 · 474b120
1 parent f53c7a8
commit 474b120
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 18 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -11,3  11,11 @@ EXTRA_DIST = config.rpath  \
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libqalculate.pc
 
 if HAVE_DOXYGEN
 
 .PHONY: docs
 docs:
 	$(MAKE) -C $(top_srcdir)/docs/reference docs
 
 endif
diff --git a/autogen.sh b/autogen.sh
@@ -135,13  135,3 @@ if test x$NOCONFIGURE = x; then
 else
   echo Skipping configure process.
 fi
-
-cd $srcdir/docs/reference
-echo "Generating API documentation"
-doxygen Doxyfile
-cd ../../
-cd $srcdir
-if [ ! -d "$srcdir/docs/reference/html" ]; then
-  echo "API documentation is missing. Please install doxygen and run autogen.sh again."
-  exit 1
-fi
diff --git a/configure.ac b/configure.ac
@@ -95,7  95,6 @@ AC_SUBST(QALCULATE_CURRENT)
 AC_SUBST(QALCULATE_REVISION)
 AC_SUBST(QALCULATE_AGE)
 
-
 dnl  --------------------------------
 dnl | check for neccessary libraries |-----------------------------------------
 dnl  --------------------------------
@@ -131,6  130,16 @@ AC_SUBST(LIBXML_LIBS)
 
 AM_ICONV()
 
 dnl  --------------------------------
 dnl | check for doxygen             |-----------------------------------------
 dnl  --------------------------------
 
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
 if test -z "$DOXYGEN"; then
    AC_MSG_WARN([Doxygen not found - API documentation will not be generated])
 fi
 AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
 
 dnl  --------------------------------
 dnl | check for readline            |-----------------------------------------
 dnl  --------------------------------

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
@@ -2,16  2,25 @@
 # docs/reference/Makefile.am for qalculate
 #
 
 EXTRA_DIST = \
 		$(top_srcdir)/docs/reference/Doxyfile
 
 if HAVE_DOXYGEN
 
 referencedir = $(docdir)/reference/html
 reference_DATA = \
-		$(top_srcdir)/docs/reference/html/*.png \
 		$(top_srcdir)/docs/reference/html/*.html \
-		$(top_srcdir)/docs/reference/html/*.css
-
-EXTRA_DIST = \
-		$(top_srcdir)/docs/reference/Doxyfile \
 		$(top_srcdir)/docs/reference/html/*.png \
-		$(top_srcdir)/docs/reference/html/*.html \
-		$(top_srcdir)/docs/reference/html/*.css
 		$(top_srcdir)/docs/reference/html/*.css \
 		$(top_srcdir)/docs/reference/html/*.js
 
 .PHONY: docs
 docs:
 	$(DOXYGEN) Doxyfile
 
 $(top_srcdir)/docs/reference/html/*.html:
 	$(DOXYGEN) Doxyfile
 
 $(top_srcdir)/docs/reference/html/*.png $(top_srcdir)/docs/reference/html/*.css $(top_srcdir)/docs/reference/html/*.js:
 
 endif