diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-19 14:55:28 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-19 14:55:28 -0500 |
| commit | f7306e0752108847aa4a0c9f63fca46aa9a706df (patch) | |
| tree | 596e945a99a7aed5a0b28fb8d2daba03f477476b /data/Makefile.am | |
| parent | 8c4cd9001609ddd0ab6d2a30aa456bc4a67fa8a0 (diff) | |
| parent | 36098537001011bffd6b74ccbf318b59c81d75e8 (diff) | |
| download | ayatana-indicator-session-f7306e0752108847aa4a0c9f63fca46aa9a706df.tar.gz ayatana-indicator-session-f7306e0752108847aa4a0c9f63fca46aa9a706df.tar.bz2 ayatana-indicator-session-f7306e0752108847aa4a0c9f63fca46aa9a706df.zip | |
* Upstream Merge
* GSettings transition
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..27328fb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,37 +9,22 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -############################## -# GConf Schema -############################## - -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-session.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - @INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ +gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml + +convertdir = $(datadir)/GConf/gsettings +dist_convert_DATA = indicator-session.convert -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ EXTRA_DIST = \ $(service_in_files) \ - $(schema_in_files) + $(gsettings_SCHEMAS:.xml=.xml.in) + CLEANFILES = \ $(dbus_services_DATA) \ - $(schema_DATA) - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif + $(gsettings_SCHEMAS) + |