From f1167112d926b189fe189599576e8588923f036c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Aug 2005 21:31:30 +0000
Subject: * cleanup build system a little * strip remaining glib usage * -fPIC
 build fix for x86-64 (thanks tvainika)

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@336 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 tests/c-plus-plus-test.cc | 51 +++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'tests/c-plus-plus-test.cc')

diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc
index e87ef25..2535d38 100644
--- a/tests/c-plus-plus-test.cc
+++ b/tests/c-plus-plus-test.cc
@@ -19,42 +19,45 @@
   USA.
 ***/
 
-#include <avahi-common/error.h>
-#include <avahi-common/strlst.h>
-#include <avahi-common/simple-watch.h>
+#include <avahi-common/address.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/cdecl.h>
+#include <avahi-common/dbus-watch-glue.h>
 #include <avahi-common/dbus.h>
-#include <avahi-common/timeval.h>
-#include <avahi-common/watch.h>
-#include <avahi-common/malloc.h>
+#include <avahi-common/defs.h>
 #include <avahi-common/domain.h>
-#include <avahi-common/cdecl.h>
-#include <avahi-common/alternative.h>
+#include <avahi-common/error.h>
 #include <avahi-common/gccmacro.h>
-#include <avahi-common/defs.h>
-#include <avahi-common/address.h>
 #include <avahi-common/llist.h>
-#include <avahi-core/query-sched.h>
-#include <avahi-core/probe-sched.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/simple-watch.h>
+#include <avahi-common/strlst.h>
+#include <avahi-common/timeval.h>
+#include <avahi-common/watch.h>
 #include <avahi-core/announce.h>
-#include <avahi-core/util.h>
-#include <avahi-core/rrlist.h>
+#include <avahi-core/browse.h>
+#include <avahi-core/cache.h>
+#include <avahi-core/core.h>
 #include <avahi-core/dns.h>
 #include <avahi-core/fdutil.h>
-#include <avahi-core/core.h>
-#include <avahi-core/prioq.h>
-#include <avahi-core/browse.h>
+#include <avahi-core/hashmap.h>
+#include <avahi-core/iface.h>
+#include <avahi-core/log.h>
 #include <avahi-core/netlink.h>
-#include <avahi-core/cache.h>
+#include <avahi-core/prioq.h>
+#include <avahi-core/probe-sched.h>
+#include <avahi-core/query-sched.h>
+#include <avahi-core/response-sched.h>
+#include <avahi-core/rr.h>
+#include <avahi-core/rrlist.h>
 #include <avahi-core/server.h>
 #include <avahi-core/socket.h>
-#include <avahi-core/rr.h>
-#include <avahi-core/iface.h>
-#include <avahi-core/hashmap.h>
-#include <avahi-core/log.h>
 #include <avahi-core/timeeventq.h>
-#include <avahi-core/response-sched.h>
-#include <avahi-client/internal.h>
+#include <avahi-core/util.h>
 #include <avahi-client/client.h>
+#include <avahi-client/internal.h>
+#include <avahi-glib/glib-malloc.h>
+#include <avahi-glib/glib-watch.h>
 
 int main(int argc, char*argv[]) {
     return 0;
-- 
cgit