summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Williams <peter@newton.cx>2015-12-19 21:20:49 -0500
committerPeter Williams <peter@newton.cx>2015-12-19 21:20:49 -0500
commit225474e2555265eb4bfb8f2018c0d6695a420f6a (patch)
tree603fe6b33eb8ea96ff3f443dcdcf1ff602bf6579
parenta0b9ef3b469ca23c6a3229d8abb967cbbddcee38 (diff)
downloaddbus-c++-225474e2555265eb4bfb8f2018c0d6695a420f6a.tar.gz
Update autotools stuff to silence warnings.
-rw-r--r--configure.ac6
-rw-r--r--doc/Makefile.am11
2 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index f487786..29c9d9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
# Autojunk script for libdbus-c++
AC_PREREQ(2.59)
-AC_INIT([libdbus-c++], 0.9.0, [andreas.volz@tux-style.com])
-
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AC_INIT([libdbus-c++], 0.9.0)
+AC_CONFIG_SRCDIR([src/error.cpp])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([subdir-objects])
AC_CANONICAL_HOST
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f0b5920..8942d6f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,16 @@ if DBUS_DOXYGEN_DOCS_ENABLED
PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
-EXTRA_DIST = Doxyfile.in $(wildcard img/*.*) head.html foot.html dbus-c++.css mainpage
+EXTRA_DIST = Doxyfile.in head.html foot.html dbus-c++.css mainpage \
+ dbus-c++-doxy.css \
+ foot_bg.png \
+ head_bg.png \
+ header_menu_background_last.png \
+ header_menu_background.png \
+ header_menu_current_background.png \
+ header_menu_unselected_background.png \
+ logo.png
+
doc-clean:
rm -rf html/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*