* do no longer include timeval.h in watch.h by default

* fix some include lines from "" to <>
* drop dbus.h from doxygen, users of our libraries shouldn't care
* other cleanups


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@801 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

17 files changed, 26 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 52f1422..d08fd87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,6 @@ DX_INPUT = \
 	$(srcdir)/avahi-glib/glib-watch.h \
 	$(srcdir)/avahi-glib/glib-malloc.h \
 	$(srcdir)/avahi-common/timeval.h \
-	$(srcdir)/avahi-common/dbus.h \
 	$(srcdir)/avahi-qt/qt-watch.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
diff --git a/avahi-common/dbus-watch-glue.c b/avahi-common/dbus-watch-glue.c
index 80d35f2..46fcc90 100644
--- a/avahi-common/dbus-watch-glue.c
+++ b/avahi-common/dbus-watch-glue.c
@@ -22,8 +22,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <avahi-common/malloc.h>
-
+#include "malloc.h"
+#include "timeval.h"
 #include "dbus-watch-glue.h"
 
 static AvahiWatchEvent translate_dbus_to_avahi(unsigned int f) {
diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
index 2a15c5e..3633521 100644
--- a/avahi-common/simple-watch.c
+++ b/avahi-common/simple-watch.c
@@ -31,9 +31,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <avahi-common/llist.h>
-#include <avahi-common/malloc.h>
-
+#include "llist.h"
+#include "malloc.h"
+#include "timeval.h"
 #include "simple-watch.h"
 
 struct AvahiWatch {
diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h
index 0833570..5a4b37d 100644
--- a/avahi-common/simple-watch.h
+++ b/avahi-common/simple-watch.h
@@ -26,8 +26,7 @@
 
 #include <sys/poll.h>
 #include <avahi-common/cdecl.h>
-
-#include "watch.h"
+#include <avahi-common/watch.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
diff --git a/avahi-common/watch.h b/avahi-common/watch.h
index 9f82729..b973683 100644
--- a/avahi-common/watch.h
+++ b/avahi-common/watch.h
@@ -25,9 +25,9 @@
 /** \file watch.h Simplistic main loop abstraction */
 
 #include <sys/poll.h>
-#include <avahi-common/cdecl.h>
+#include <sys/time.h>
 
-#include "timeval.h"
+#include <avahi-common/cdecl.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 8cf1d34..94c34b9 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -33,6 +33,8 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
+
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 #include <avahi-core/publish.h>
diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index b119e46..6e8e00e 100644
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -34,6 +34,7 @@
 #include <avahi-common/alternative.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
+#include <avahi-common/timeval.h>
 
 #include "core.h"
 #include "log.h"
diff --git a/avahi-core/lookup.h b/avahi-core/lookup.h
index 50f7631..153fb67 100644
--- a/avahi-core/lookup.h
+++ b/avahi-core/lookup.h
@@ -64,8 +64,8 @@ typedef struct AvahiSDNSServerBrowser AvahiSDNSServerBrowser;
 AVAHI_C_DECL_END
 #endif
 
-#include "core.h"
-#include "publish.h"
+#include <avahi-core/core.h>
+#include <avahi-core/publish.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
diff --git a/avahi-core/multicast-lookup.c b/avahi-core/multicast-lookup.c
index 4ba48b4..339215d 100644
--- a/avahi-core/multicast-lookup.c
+++ b/avahi-core/multicast-lookup.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <avahi-common/malloc.h>
+#include <avahi-common/timeval.h>
 
 #include "server.h"
 #include "browse.h"
diff --git a/avahi-core/netlink.h b/avahi-core/netlink.h
index 46d8e0b..8f2f8cb 100644
--- a/avahi-core/netlink.h
+++ b/avahi-core/netlink.h
@@ -24,6 +24,8 @@
 
 #include <sys/socket.h>
 #include <asm/types.h>
+#include <inttypes.h>
+
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
diff --git a/avahi-core/publish.h b/avahi-core/publish.h
index a10a5a8..a5b3025 100644
--- a/avahi-core/publish.h
+++ b/avahi-core/publish.h
@@ -41,7 +41,7 @@ typedef struct AvahiSEntryGroup AvahiSEntryGroup;
 AVAHI_C_DECL_END
 #endif
 
-#include "core.h"
+#include <avahi-core/core.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
diff --git a/avahi-core/querier-test.c b/avahi-core/querier-test.c
index 41efc2c..6ba33d0 100644
--- a/avahi-core/querier-test.c
+++ b/avahi-core/querier-test.c
@@ -29,6 +29,8 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
+
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 #include <avahi-core/publish.h>
diff --git a/avahi-core/rr.h b/avahi-core/rr.h
index 6824d2a..7c00152 100644
--- a/avahi-core/rr.h
+++ b/avahi-core/rr.h
@@ -24,13 +24,13 @@
 
 /** \file rr.h Functions and definitions for manipulating DNS resource record (RR) data. */
 
+#include <inttypes.h>
+#include <sys/types.h>
+
 #include <avahi-common/strlst.h>
 #include <avahi-common/address.h>
 #include <avahi-common/cdecl.h>
 
-#include <inttypes.h>
-#include <sys/types.h>
-
 AVAHI_C_DECL_BEGIN
 
 /** DNS record types, see RFC 1035 */
diff --git a/avahi-core/update-test.c b/avahi-core/update-test.c
index 8c5b5ed..bd42c75 100644
--- a/avahi-core/update-test.c
+++ b/avahi-core/update-test.c
@@ -30,6 +30,7 @@
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
 
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index 1075084..2c5f8c1 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -30,6 +30,7 @@
 
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
+#include <avahi-common/timeval.h>
 
 #include "server.h"
 #include "browse.h"
diff --git a/avahi-glib/glib-watch.c b/avahi-glib/glib-watch.c
index e6def46..a99cb4d 100644
--- a/avahi-glib/glib-watch.c
+++ b/avahi-glib/glib-watch.c
@@ -25,6 +25,7 @@
 
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/timeval.h>
 
 #include "glib-watch.h"
 
diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index 2426798..5b49845 100644
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -29,6 +29,7 @@
 #include <qobject.h>
 #include <qtimer.h>
 #endif
+#include <avahi-common/timeval.h>
 #include "qt-watch.h"
 
 class AvahiWatch : public QObject