diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-24 12:40:30 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-24 12:40:30 -0600 |
| commit | 23af95956cddc1d3cb858d537a2c85cb0f0d0851 (patch) | |
| tree | 29697cfc2abd5de2af60c34dd1c82f30100886ef /libdbusmenu-glib/Makefile.am | |
| parent | 1153cfedbbc67c667e117d18d5bf15a3a5a31a2a (diff) | |
| parent | e13383fbe886022ec4183ce55f8108ef1c68185d (diff) | |
| download | libdbusmenu-23af95956cddc1d3cb858d537a2c85cb0f0d0851.tar.gz libdbusmenu-23af95956cddc1d3cb858d537a2c85cb0f0d0851.tar.bz2 libdbusmenu-23af95956cddc1d3cb858d537a2c85cb0f0d0851.zip | |
* Upstream Merge
* Add a signal on the menuitem for generic event support
* Handle the case of a single NULL entry as well.
* Not checking defaults when value is NULL
* Add the 'type' variable first when processing new
menuitems
* Protection from unref'ing NULL variants
* Only send the requested properties and request fewer
* Add in a defaults database
* Only send property updates if the menu item has been
seen on the bus.
* Add a property for text direction.
* Add a property for needing attention.
Diffstat (limited to 'libdbusmenu-glib/Makefile.am')
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 5ddbeb8..bf80996 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -1,6 +1,7 @@ -CLEANFILES = - +BUILT_SOURCES = +CLEANFILES = +DISTCLEANFILES = EXTRA_DIST = \ clean-namespaces.xslt \ dbusmenu-glib-0.4.pc.in \ @@ -9,6 +10,8 @@ EXTRA_DIST = \ menuitem-marshal.list \ server-marshal.list +include $(top_srcdir)/Makefile.am.enum + lib_LTLIBRARIES = \ libdbusmenu-glib.la @@ -19,13 +22,16 @@ libdbusmenu_glibinclude_HEADERS = \ menuitem.h \ menuitem-proxy.h \ server.h \ - client.h + client.h \ + types.h libdbusmenu_glib_la_SOURCES = \ dbus-menu-clean.xml.h \ dbus-menu-clean.xml.c \ defaults.h \ defaults.c \ + enum-types.h \ + enum-types.c \ menuitem.h \ menuitem.c \ menuitem-marshal.h \ @@ -58,6 +64,14 @@ libdbusmenu_glib_la_LIBADD = \ pkgconfig_DATA = dbusmenu-glib-0.4.pc pkgconfigdir = $(libdir)/pkgconfig +glib_enum_h = enum-types.h +glib_enum_c = enum-types.c +glib_enum_headers = $(addprefix $(srcdir)/, $(libdbusmenu_glibinclude_HEADERS)) + +DISTCLEANFILES += \ + enum-types.c \ + enum-types.h + %.xml.h: %.xml echo "extern const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@))));" > $@ @@ -71,7 +85,7 @@ dbus-menu-clean.xml: dbus-menu.xml CLEANFILES += dbus-menu-clean.xml -BUILT_SOURCES = \ +BUILT_SOURCES += \ dbus-menu-clean.xml.c \ dbus-menu-clean.xml.h \ client-marshal.h \ |