diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-15 21:38:27 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-15 21:38:27 +0100 |
| commit | be1db87a7e1997e5dd1b69948136c30c7c39d960 (patch) | |
| tree | f22ea28af5a331799fb6aca0c900a73e9a476720 /libdbusmenu-gtk/Makefile.am | |
| parent | ba23a1f5d6bed315132fb45ff7a63384e2da4e42 (diff) | |
| parent | 49e45c8b23af0926ec04c50a4ac53068abba21db (diff) | |
| download | libdbusmenu-be1db87a7e1997e5dd1b69948136c30c7c39d960.tar.gz libdbusmenu-be1db87a7e1997e5dd1b69948136c30c7c39d960.tar.bz2 libdbusmenu-be1db87a7e1997e5dd1b69948136c30c7c39d960.zip | |
* debian/control:
- drop git binaries, the libdev depends on it
- set ubuntu vcs
- use the current vala version
[ Ted Gould ]
* New upstream release.
* Remove unused const on GStrv's
* Only free when there is data to free
* Ensure that we only return once even with error (LP: #929856)
* Fix an error on a failure to send properties (LP: #929707)
* Ensure the hash variant isn't NULL in the comparison (LP: #929710)
* Fix some of the issues with throwing criticals
* Ensure our tests fail if they throw criticals
* Parse and handle a11y descriptions
* Don't pass NULL to ATK
* Non-srcdir build fixes
Diffstat (limited to 'libdbusmenu-gtk/Makefile.am')
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b1ee91a..fcebd04 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -68,7 +68,7 @@ libdbusmenu_gtk_la_CFLAGS = \ -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" libdbusmenu_gtk_la_LIBADD = \ - ../libdbusmenu-glib/libdbusmenu-glib.la \ + $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGTK_LIBS) # We duplicate these here because Automake won't let us use $(VER) on the left hand side. @@ -118,7 +118,8 @@ DbusmenuGtk_0_4_gir_INCLUDES = \ $(GTKGIR) \ Dbusmenu-0.4 DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la +DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la \ + $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER) DbusmenuGtk_0_4_gir_EXPORT_PACKAGES = dbusmenu-gtk$(VER)-0.4 |