diff options
Diffstat (limited to 'tests/Makefile.in')
| -rw-r--r-- | tests/Makefile.in | 67 |
1 files changed, 51 insertions, 16 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 581a9ef..fc45956 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,6 +18,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,9 +57,9 @@ TESTS = test-glib-objects-test test-glib-events \ test-glib-events-nogroup test-glib-layout test-glib-properties \ test-glib-proxy test-glib-simple-items$(EXEEXT) \ test-glib-submenu $(am__append_1) $(am__append_2) -@WANT_DBUSMENUDUMPER_TRUE@am__append_1 = \ -@WANT_DBUSMENUDUMPER_TRUE@ test-json \ -@WANT_DBUSMENUDUMPER_TRUE@ test-json-instruction +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@am__append_1 = \ +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@ test-json \ +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@ test-json-instruction @WANT_LIBDBUSMENUGTK_TRUE@am__append_2 = \ @WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-objects-test \ @@ -65,9 +82,9 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \ test-glib-submenu-server$(EXEEXT) \ test-glib-simple-items$(EXEEXT) $(am__EXEEXT_1) \ $(am__EXEEXT_2) -@WANT_DBUSMENUDUMPER_TRUE@am__append_3 = \ -@WANT_DBUSMENUDUMPER_TRUE@ test-json-client \ -@WANT_DBUSMENUDUMPER_TRUE@ test-json-server +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@am__append_3 = \ +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@ test-json-client \ +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@ test-json-server @WANT_LIBDBUSMENUGTK_TRUE@am__append_4 = \ @WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-objects \ @@ -143,8 +160,8 @@ libdbusmenu_jsonloader_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) \ $(libdbusmenu_jsonloader_la_LDFLAGS) $(LDFLAGS) -o $@ -@WANT_DBUSMENUDUMPER_TRUE@am__EXEEXT_1 = test-json-client$(EXEEXT) \ -@WANT_DBUSMENUDUMPER_TRUE@ test-json-server$(EXEEXT) +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@am__EXEEXT_1 = test-json-client$(EXEEXT) \ +@HAVE_VALGRIND_TRUE@@WANT_DBUSMENUDUMPER_TRUE@ test-json-server$(EXEEXT) @WANT_LIBDBUSMENUGTK_TRUE@am__EXEEXT_2 = test-gtk-objects$(EXEEXT) \ @WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-label-client$(EXEEXT) \ @WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-label-server$(EXEEXT) \ @@ -495,6 +512,11 @@ DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \ $(test_gtk_submenu_client_SOURCES) \ $(test_gtk_submenu_server_SOURCES) $(test_json_client_SOURCES) \ $(test_json_server_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(examples_DATA) $(json_DATA) $(pkgconfig_DATA) HEADERS = $(libdbusmenu_jsonloaderinclude_HEADERS) ETAGS = etags @@ -1182,7 +1204,6 @@ dbusmenu-jsonloader-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jso cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -1190,6 +1211,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -1734,8 +1757,11 @@ clean-libtool: -rm -rf .libs _libs install-examplesDATA: $(examples_DATA) @$(NORMAL_INSTALL) - test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1752,8 +1778,11 @@ uninstall-examplesDATA: dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir) install-jsonDATA: $(json_DATA) @$(NORMAL_INSTALL) - test -z "$(jsondir)" || $(MKDIR_P) "$(DESTDIR)$(jsondir)" @list='$(json_DATA)'; test -n "$(jsondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(jsondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(jsondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1770,8 +1799,11 @@ uninstall-jsonDATA: dir='$(DESTDIR)$(jsondir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1788,8 +1820,11 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libdbusmenu_jsonloaderincludeHEADERS: $(libdbusmenu_jsonloaderinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libdbusmenu_jsonloaderincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" @list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2162,7 +2197,7 @@ test-json: test-json-client test-json-server Makefile.am @echo export UBUNTU_MENUPROXY="" >> $@ @echo export G_DEBUG=fatal_criticals >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@ @chmod +x $@ @@ -2175,7 +2210,7 @@ test-json-instruction: test-json-client test-json-server test-json-instruction-c @echo export UBUNTU_MENUPROXY="" >> $@ @echo export G_DEBUG=fatal_criticals >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --ignore-return --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @chmod +x $@ ###################### |