diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-20 13:54:47 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-20 13:54:47 -0500 |
| commit | 0d1146440b9f386fc521d08d97fc1c6643339adc (patch) | |
| tree | ed1927abd138f8dcb18be088c946e14bf26f63bc /tools | |
| parent | 2fd9f0d0c632cb9cb0cff3a843a4871109dee6ef (diff) | |
| parent | cc2773830760a016ec1b5c5af230fcd9114d267c (diff) | |
| download | libdbusmenu-0d1146440b9f386fc521d08d97fc1c6643339adc.tar.gz libdbusmenu-0d1146440b9f386fc521d08d97fc1c6643339adc.tar.bz2 libdbusmenu-0d1146440b9f386fc521d08d97fc1c6643339adc.zip | |
* Upstream Merge
* Fixing up VAPI files to build them correctly
* Fix documentation title page
* Reject text nodes early (warnings with Qt integration)
* Autogen
* debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
names for package list.
* debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
typelib file.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 6 | ||||
| -rw-r--r-- | tools/testapp/Makefile.in | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index bcf5acc..e3a87aa 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -40,7 +40,11 @@ libexec_PROGRAMS = dbusmenu-dumper$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(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) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in index 979d58f..2b17ca3 100644 --- a/tools/testapp/Makefile.in +++ b/tools/testapp/Makefile.in @@ -38,7 +38,11 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT) subdir = tools/testapp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(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) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |