diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-08-14 15:51:54 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-08-14 15:51:54 +0000 |
| commit | a4acfaf4f942f702606e660990c873c9ff5b0395 (patch) | |
| tree | fdc2e242d66130f3bdaa46514c903a01826b1d40 /tests | |
| parent | 24e661eb636f6397b4a149156f451cb551d32013 (diff) | |
* Fix docs/INSTALL for the right dbus path for debian (Thanks sebest)
* Put -DDBUS_API_SUBJECT_TO_CHANGE in DBUS_CFLAGS and
remove from individual files
* Add avahi-client to the C++ test runs, compile with DBUS flags
* Fix avahi-client to compile with C++ compilers.
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@323 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/c-plus-plus-test-gen.py | 1 | ||||
| -rw-r--r-- | tests/c-plus-plus-test.cc | 48 |
3 files changed, 30 insertions, 23 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d37ce42..5b146c0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,6 +24,10 @@ AM_CFLAGS= \ AM_CFLAGS+=$(GLIB20_CFLAGS) AM_LDADD=$(GLIB20_LIBS) +# DBUS +AM_CFLAGS+=$(DBUS_CFLAGS) +AM_LDADD+=$(DBUS_LIBS) + noinst_PROGRAMS = \ c-plus-plus-test diff --git a/tests/c-plus-plus-test-gen.py b/tests/c-plus-plus-test-gen.py index 62498f5..b1d6aae 100755 --- a/tests/c-plus-plus-test-gen.py +++ b/tests/c-plus-plus-test-gen.py @@ -54,6 +54,7 @@ print """/* $Id$ */ print_includes("avahi-common") print_includes("avahi-core") +print_includes("avahi-client") print """ int main(int argc, char*argv[]) { diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc index 483ff5b..e87ef25 100644 --- a/tests/c-plus-plus-test.cc +++ b/tests/c-plus-plus-test.cc @@ -19,40 +19,42 @@ USA. ***/ -#include <avahi-common/alternative.h> -#include <avahi-common/defs.h> +#include <avahi-common/error.h> +#include <avahi-common/strlst.h> +#include <avahi-common/simple-watch.h> +#include <avahi-common/dbus.h> #include <avahi-common/timeval.h> #include <avahi-common/watch.h> #include <avahi-common/malloc.h> -#include <avahi-common/address.h> -#include <avahi-common/simple-watch.h> -#include <avahi-common/llist.h> -#include <avahi-common/error.h> #include <avahi-common/domain.h> -#include <avahi-common/gccmacro.h> -#include <avahi-common/dbus.h> #include <avahi-common/cdecl.h> -#include <avahi-common/strlst.h> -#include <avahi-core/prioq.h> -#include <avahi-core/cache.h> -#include <avahi-core/rr.h> -#include <avahi-core/hashmap.h> +#include <avahi-common/alternative.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-core/announce.h> #include <avahi-core/util.h> -#include <avahi-core/socket.h> -#include <avahi-core/response-sched.h> -#include <avahi-core/browse.h> #include <avahi-core/rrlist.h> -#include <avahi-core/query-sched.h> +#include <avahi-core/dns.h> +#include <avahi-core/fdutil.h> #include <avahi-core/core.h> -#include <avahi-core/probe-sched.h> +#include <avahi-core/prioq.h> +#include <avahi-core/browse.h> +#include <avahi-core/netlink.h> +#include <avahi-core/cache.h> #include <avahi-core/server.h> -#include <avahi-core/dns.h> -#include <avahi-core/timeeventq.h> +#include <avahi-core/socket.h> +#include <avahi-core/rr.h> #include <avahi-core/iface.h> -#include <avahi-core/announce.h> -#include <avahi-core/netlink.h> +#include <avahi-core/hashmap.h> #include <avahi-core/log.h> -#include <avahi-core/fdutil.h> +#include <avahi-core/timeeventq.h> +#include <avahi-core/response-sched.h> +#include <avahi-client/internal.h> +#include <avahi-client/client.h> int main(int argc, char*argv[]) { return 0; |