2002-11-22 Havoc Pennington <hp@redhat.com>

	* Makefile.am: include "Doxyfile" target in all-local

	* configure.in: generate the Doxyfile

	* Doxyfile.in: move Doxyfile here, so we can use
	configure to generate a Doxyfile with the right
	version number etc.

diff --git a/ChangeLog b/ChangeLog
index ff71e847e4fd01207f6139105f5df8002e1bfcee..489f84aa53eb752b25235d3c6b826ef2d33bd1e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-22  Havoc Pennington  <hp@redhat.com>
+
+       * Makefile.am: include "Doxyfile" target in all-local
+
+       * configure.in: generate the Doxyfile
+
+       * Doxyfile.in: move Doxyfile here, so we can use 
+       configure to generate a Doxyfile with the right 
+       version number etc.
+
 2002-11-22  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-message.c: move inline docs into .c file

diff --git a/Doxyfile b/Doxyfile.in
similarity index 99%
rename from Doxyfile
rename to Doxyfile.in
index b260b861568a6b60d65a34bddef31c953bca7d9b..224271b0b3e461a754c58d39201ad3d8219e2baf 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile.in
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = DBus
-PROJECT_NUMBER         = 1.0
+PROJECT_NAME           = D-BUS
+PROJECT_NUMBER         = @VERSION@
 OUTPUT_DIRECTORY       = doc/api
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = NO

diff --git a/Makefile.am b/Makefile.am
index 49809c6cd0f917530a3d526fbef9b909962a1a7f..e1450cdd1fb7ee826bcf467f7b5bd37d3eef8dcc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,4 @@
 
 SUBDIRS=dbus bus test doc
+
+all-local: Doxyfile

diff --git a/configure.in b/configure.in
index 6a9353e29fd8621685031257c55b12c7071eef21..c663825457a6ef0eb77abd42bbe1f63b1a9ee9fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -58,6 +58,7 @@ AC_SUBST(DBUS_BUS_LIBS)
 
 AC_OUTPUT([
 Makefile
+Doxyfile
 dbus/Makefile
 bus/Makefile
 test/Makefile