diff options
| author | Didier Roche <didier.roche@canonical.com> | 2012-09-20 18:46:43 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2012-09-20 18:46:43 +0200 |
| commit | 7cc396a8a286cebb890aa718530d2acda63fa7df (patch) | |
| tree | 7cdde9cd0352fb262a893683b8b2c93e5a4f7ffe /tools/testapp | |
| parent | 39588b350296d635de3dcbb4ea8499c8c693b90e (diff) | |
| parent | c36de4d59150df37ec782a17fb3d14424fb4734a (diff) | |
| download | libdbusmenu-7cc396a8a286cebb890aa718530d2acda63fa7df.tar.gz libdbusmenu-7cc396a8a286cebb890aa718530d2acda63fa7df.tar.bz2 libdbusmenu-7cc396a8a286cebb890aa718530d2acda63fa7df.zip | |
* New upstream release.
- Honor changes to GtkSettings' gtk-menu-images value (LP: #927236)
- don't display an underscore on menuitimes containing a '&' (LP: #994564)
- set the widget for the accelerator even if there isn't a mnemonic
(LP: #982656)
- make the vala bindings use pkg-config names, rather than gir ones
- Some platforms don't have valgrind, so treat those unit tests separately
- make headers match independent of the build directory
- constify some public API calls
Diffstat (limited to 'tools/testapp')
| -rw-r--r-- | tools/testapp/Makefile.in | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in index 3cdd992..e57704f 100644 --- a/tools/testapp/Makefile.in +++ b/tools/testapp/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, @@ -16,6 +16,23 @@ @SET_MAKE@ 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@ @@ -95,6 +112,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(dbusmenu_testapp_SOURCES) DIST_SOURCES = $(dbusmenu_testapp_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -334,8 +356,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ |