diff --git a/COPYING b/COPYING
index caeca07..88798ab 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.14/COPYING
\ No newline at end of file
+/usr/share/automake-1.15/COPYING
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 243a9d9..9d4e796 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2016-08-26 14:10
+
+ * COPYING, INSTALL, ax_init_standard_project.m4, bootstrap.sh,
+ doc/doxyfile.in: updated documentation build
+
+2016-08-25 19:53
+
+ * configure.ac, debian/control.in, src/matrix.hxx, test/basic.cxx,
+ test/makefile.am, test/matricxx.cxx: documentation updated
+
+2016-08-25 18:56
+
+ * README, ax_init_standard_project.m4, bootstrap.sh, configure.ac,
+ doc/header.html.in, doc/style.css: documentation anhanced
+
+2016-08-25 18:02
+
+ * COPYING, ChangeLog, INSTALL, README, ax_init_standard_project.m4,
+ doc/doxyfile.in, doc/footer.html.in, doc/header.html.in,
+ doc/style.css, test/matricxx.cxx: documentation anhanced
+
2016-08-25 15:00
* README, ax_init_standard_project.m4, bootstrap.sh,
diff --git a/INSTALL b/INSTALL
index f812f5a..ddcdb76 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.14/INSTALL
\ No newline at end of file
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 1badd4a..7c6a416 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -171,22 +171,19 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
AX_SUBST(NUMBERS)
AX_SUBST(HOME)
if test -f README.md; then
- README=$(tail -n +3 README.md)
+ README=$()
DESCRIPTION=$(head -1 README.md)
else
README=$(tail -n +3 README)
DESCRIPTION=$(head -1 README)
fi
- README_ESCAPED=$(echo "$README" | sed ':a;N;$!ba;s/\n/\\n/g;s,",\\",g')
if which pandoc 2>&1 > /dev/null; then
- README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\n,\\\\\\\\n,g;s/\n/\\n/g;s,",\\",g')
+ README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\\(.\),\\\\\1,g;s/\n/\\n/g;s,",\\",g;s, ,\ \ ,g')
else
README_HTML="${README}"
fi
AX_SUBST(README)
_AM_SUBST_NOTMAKE([README])
- AX_SUBST(README_ESCAPED)
- _AM_SUBST_NOTMAKE([README_ESCAPED])
AX_SUBST(README_HTML)
_AM_SUBST_NOTMAKE([README_HTML])
AX_SUBST(DESCRIPTION)
@@ -200,6 +197,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
AX_SUBST(AUTHOR_NAME)
AX_SUBST(AUTHOR_URL)
AX_SUBST(AUTHOR_MAIL)
+ PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
+ SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
+ AX_SUBST(PROJECT_URL)
+ AX_SUBST(SOURCE_DOWNLOAD)
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
AX_SUBST(DISTRO)
ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
diff --git a/bootstrap.sh b/bootstrap.sh
index b69f0d8..8a7c967 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -569,6 +569,20 @@ if ! testtag AX_CHECK_QT && \
! testtag AX_REQUIRE_QT; then
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \
to --condition AX_USE_CXX src/makefile.am
+ if ! ls src/*.[ch]xx; then
+ to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.hxx <
#include
@@ -679,7 +700,8 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} {
#endif
EOF
- to --condition AX_USE_CXX src/${PACKAGE_NAME}.ui <
${PackageName}
@@ -761,7 +783,7 @@ EOF
to --condition AX_USE_CXX src/version.cxx <\$projectbrief
@@ -925,7 +947,18 @@ to --condition AX_USE_DOXYGEN doc/style.css <