diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index bd79912..0000000 --- a/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org> diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 1b48313..7509d7a 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -239,6 +239,18 @@ maintainer-clean-example-targets: EOF ]) +# use this in configure.ac to support HTML data for webservers +AC_DEFUN([AX_BUILD_HTML], [ + AC_CONFIG_FILES([html/makefile]) + AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [html/makefile.in]) + test -f html/makefile.in && cat >> examples/html.in <<EOF +#### Begin: Appended by $0 +maintainer-clean-example-targets: + -rm makefile.in +#### End: $0 +EOF +]) + # use this in configure.ac to support C++ libraries AC_DEFUN([AX_USE_LIBTOOL], [ # libtool versioning diff --git a/bootstrap.sh b/bootstrap.sh index f36cedf..c29a037 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -107,6 +107,7 @@ GENERATED FILES * src/makefile.am - if you enabled AX_USE_CXX * src/version.hxx - if you enabled AX_USE_CXX * src/version.cxx - if you enabled AX_USE_CXX + * html/makefile.am - if you enabled AX_BUILD_HTML * scripts/makefile.in - if you enabled AX_USE_SCRIPTS * doc/makefile.am - if you enabled AX_USE_DOXYGEN * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN @@ -147,6 +148,7 @@ FILES TO EDIT * README * configure.ac * src/makefile.am + * html/makefile.am * test/makefile.am * examples/makefile.am @@ -156,6 +158,7 @@ FILE DEPENDENCIES configuration a dependent, i.e.: * test/makefile.am depends on AX_USE_LIBTOOL + * html/makefile.am depends on AX_BUILD_HTML * doc/doxyfile.in depends on AX_BUILD_EXAMPLES * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT, AX_CXX_QT, AX_CXX_CHECK_QT, AX_USE_LIBTOOL @@ -233,6 +236,10 @@ HEADER='## @id '"\$Id\$"' ' +notice() { + echo -e "\e[1;33m$*\e[0m" +} + run() { check=1 while test $# -gt 0; do @@ -367,9 +374,15 @@ copy ${MY_NAME} copy ax_init_standard_project.m4 copy ax_cxx_compile_stdcxx_11.m4 copy ax_check_qt.m4 -copy AUTHORS +AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1) +if test -z "${AUTHOR}"; then + AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>" +fi +to AUTHORS <<EOF && notice "please edit AUTHORS" +$AUTHOR +EOF to configure.ac <<EOF && \ - ( echo "please edit configure.ac, then rerun $0"; exit 0 ) + ( notice "please edit configure.ac, then rerun $0"; exit 0 ) ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name m4_define(x_major, 0) # project's major version m4_define(x_minor, 0) # project's minor version @@ -387,10 +400,11 @@ AX_INIT_STANDARD_PROJECT #AX_USE_RPM_PACKAGING #AX_USE_CPPUNIT #AX_BUILD_EXAMPLES +#AX_BUILD_HTML # qt features, uncomment, what you need: #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) -#AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_KEYWORDS" +#AX_QT_NO_KEYWORDS # create output AC_OUTPUT @@ -488,6 +502,14 @@ ${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src AM_LDFLAGS = -L${top_builddir}/src/.libs LDADD = -l${PACKAGE_NAME} +MAINTAINERCLEANFILES = makefile.in +EOF +to --condition AX_BUILD_HTML html/makefile.am <<EOF +${HEADER}EXTRA_DIST = \${www_DATA} + +wwwdir = \${pkgdatadir}/html +www_DATA = + MAINTAINERCLEANFILES = makefile.in EOF if testtag AX_USE_DOXYGEN && \ @@ -617,7 +639,7 @@ EOF echo 7 | to debian/compat fi SUBDIRS="" -for d in src test scripts doc examples; do +for d in src test scripts doc examples html; do test -d $d && SUBDIRS="${SUBDIRS} $d" done to makefile.am<<EOF