diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-16 22:43:07 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-16 22:43:07 -0600 |
| commit | b7835fe50f382dccbab670033d2ce6e3ed4218c3 (patch) | |
| tree | 8dbd33625d9136a9de3bf268b1e9cc4e6e08d48c | |
| parent | c4dc796cc3fa9905db875e021ccc29763fda616e (diff) | |
| download | libdbusmenu-b7835fe50f382dccbab670033d2ce6e3ed4218c3.tar.gz libdbusmenu-b7835fe50f382dccbab670033d2ce6e3ed4218c3.tar.bz2 libdbusmenu-b7835fe50f382dccbab670033d2ce6e3ed4218c3.zip | |
Adding building the enums untilthe build system
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4510b6d..f1c275f 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,8 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) + AC_ARG_ENABLE([deprecations], [AS_HELP_STRING([--enable-deprecations], [allow deprecated API usage @<:@default=yes@:>@])], diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 5f8bd35..cc4a6b0 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 @@ -25,6 +28,8 @@ libdbusmenu_glibinclude_HEADERS = \ libdbusmenu_glib_la_SOURCES = \ dbus-menu-clean.xml.h \ dbus-menu-clean.xml.c \ + enum-types.h \ + enum-types.c \ menuitem.h \ menuitem.c \ menuitem-marshal.h \ @@ -57,6 +62,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 $@))));" > $@ @@ -70,7 +83,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 \ |