diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 35 | ||||
-rwxr-xr-x | tests/c-plus-plus-test-gen.py | 8 | ||||
-rw-r--r-- | tests/c-plus-plus-test.cc | 51 |
3 files changed, 53 insertions, 41 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5b146c0..1fee9d8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,24 +20,33 @@ AM_CFLAGS= \ -I$(top_srcdir) -# GLIB 2.0 -AM_CFLAGS+=$(GLIB20_CFLAGS) -AM_LDADD=$(GLIB20_LIBS) +if HAVE_GLIB +if HAVE_DBUS -# DBUS -AM_CFLAGS+=$(DBUS_CFLAGS) -AM_LDADD+=$(DBUS_LIBS) +noinst_PROGRAMS = c-plus-plus-test -noinst_PROGRAMS = \ - c-plus-plus-test +c_plus_plus_test_SOURCES = c-plus-plus-test.cc -c_plus_plus_test_SOURCES = \ - c-plus-plus-test.cc +c_plus_plus_test_CXXFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB20_CFLAGS) \ + $(DBUS_CFLAGS) -c_plus_plus_test_CXXFLAGS = $(AM_CFLAGS) -c_plus_plus_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la +c_plus_plus_test_LDADD = \ + $(AM_LDADD) \ + ../avahi-common/libavahi-common.la \ + ../avahi-core/libavahi-core.la \ + ../avahi-client/libavahi-client.la \ + ../avahi-glib/libavahi-glib.la \ + $(GLIB20_LIBS) \ + $(DBUS_LIBS) + + +endif +endif EXTRA_DIST=c-plus-plus-test-gen.py gen: - python ./c-plus-plus-test-gen.py > c-plus-plus-test.cc + python ./c-plus-plus-test-gen.py avahi-common avahi-core avahi-client avahi-glib > c-plus-plus-test.cc + diff --git a/tests/c-plus-plus-test-gen.py b/tests/c-plus-plus-test-gen.py index b1d6aae..6b18db6 100755 --- a/tests/c-plus-plus-test-gen.py +++ b/tests/c-plus-plus-test-gen.py @@ -19,12 +19,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -import os +import os, sys def print_includes(dir): files = os.listdir("../%s" % dir) files = filter(lambda fn: fn.endswith(".h") and not fn.startswith("."), files) + files.sort() for f in files: print "#include <%s/%s>" % (dir, f) @@ -52,9 +53,8 @@ print """/* $Id$ */ ***/ """ -print_includes("avahi-common") -print_includes("avahi-core") -print_includes("avahi-client") +for f in sys.argv[1:]: + print_includes(f) print """ int main(int argc, char*argv[]) { 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; |