diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-02-23 11:50:08 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-02-23 11:50:08 -0500 |
| commit | ab94a74938900977222683f8427d9bfdf0b6f0b8 (patch) | |
| tree | 881fbb6e81483afc51cd57f2ad8adc01a60ef731 /libdbusmenu-glib/Makefile.am | |
| parent | 25160024c6c2c64cbd14529abd0796b6f3be83d3 (diff) | |
| parent | fbb337084d705302b965278525f0bb7bc2580d35 (diff) | |
| download | libdbusmenu-ab94a74938900977222683f8427d9bfdf0b6f0b8.tar.gz libdbusmenu-ab94a74938900977222683f8427d9bfdf0b6f0b8.tar.bz2 libdbusmenu-ab94a74938900977222683f8427d9bfdf0b6f0b8.zip | |
* Merged from trunk (rev 220)
- Cleaning up cleaning up so we don't unref twice and crash
- Fixing the signatures to make them more consistent
- Adding defaults to translatable files
- Support a set of defaults and not sending them over the bus.
- Fixing annotations and adding tests with python.
Diffstat (limited to 'libdbusmenu-glib/Makefile.am')
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index e6877b6..5ddbeb8 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -24,6 +24,8 @@ libdbusmenu_glibinclude_HEADERS = \ libdbusmenu_glib_la_SOURCES = \ dbus-menu-clean.xml.h \ dbus-menu-clean.xml.c \ + defaults.h \ + defaults.c \ menuitem.h \ menuitem.c \ menuitem-marshal.h \ @@ -122,21 +124,21 @@ if INTROSPECTION_TEN INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ --warn-all \ --add-include-path=$(srcdir) \ - $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \ + $(addprefix --c-include=libdbusmenu-glib/, $(libdbusmenu_glibinclude_HEADERS)) \ --symbol-prefix=dbusmenu \ --identifier-prefix=Dbusmenu else INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ --warn-all \ --add-include-path=$(srcdir) \ - $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) + $(addprefix --c-include=libdbusmenu-glib/, $(libdbusmenu_glibinclude_HEADERS)) endif INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION -introspection_sources = $(libdbusmenu_glibinclude_HEADERS) +introspection_sources = $(libdbusmenu_glibinclude_HEADERS) $(libdbusmenu_glib_la_SOURCES) Dbusmenu-0.4.gir: libdbusmenu-glib.la Dbusmenu_0_4_gir_INCLUDES = \ |