diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-20 00:03:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-20 00:03:25 -0500 |
| commit | fe5eed009fa38e9855fc3260967fcdaffe9d2ef0 (patch) | |
| tree | f9c0327c928a40bc0c85209c6eb478b296adf4fe /Makefile.in | |
| parent | 0fca4c859e42bf3cafc6fa449dac3122996ed0c6 (diff) | |
| parent | c808cc90d518f9b010d937a13a8db0e8018fa9fd (diff) | |
| download | libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.tar.gz libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.tar.bz2 libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.zip | |
New upstream release.
∘ Protect functions from NULL submenus (LP: #803667)
∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761,
LP: #713690, LP: #643871, LP: #713685)
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 91fe11c..5426f1b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ compile config.guess config.sub depcomp install-sh ltmain.sh \ missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -71,7 +76,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = libdbusmenu-glib libdbusmenu-gtk tools tests docs po DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -153,6 +158,8 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HELP_DIR = @HELP_DIR@ @@ -279,16 +286,19 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ COPYING.2.1 \ COPYING-GPL3 \ m4/introspection.m4 +@WANT_TESTS_TRUE@TESTS_SUBDIR = tests +@WANT_LIBDBUSMENUGTK_TRUE@LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk SUBDIRS = \ libdbusmenu-glib \ - libdbusmenu-gtk \ + $(LIBDBUSMENUGTK_SUBDIR) \ tools \ - tests \ + $(TESTS_SUBDIR) \ docs \ po |