diff options
| author | infirit <[email protected]> | 2015-09-06 21:55:35 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-06 21:55:35 +0200 |
| commit | df7a7488950139e3884972e2363294051e33d45d (patch) | |
| tree | c442d94aba98b29a69a743701bf9a7d7a1086950 /multiload | |
| parent | 6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff) | |
| download | mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.bz2 mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.xz | |
Rework gsettings schema building
* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
Diffstat (limited to 'multiload')
| -rw-r--r-- | multiload/Makefile.am | 10 | ||||
| -rw-r--r-- | multiload/org.mate.panel.applet.multiload.gschema.xml.in (renamed from multiload/org.mate.panel.applet.multiload.gschema.xml.in.in) | 0 |
2 files changed, 4 insertions, 6 deletions
diff --git a/multiload/Makefile.am b/multiload/Makefile.am index 4241b48b..2cad698c 100644 --- a/multiload/Makefile.am +++ b/multiload/Makefile.am @@ -30,16 +30,14 @@ mate_multiload_applet_LDADD = \ -lm @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.multiload.gschema.xml +multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in +gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - EXTRA_DIST = \ org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(multiload_gschema_in_files) \ $(ui_DATA) uidir = $(datadir)/mate/ui @@ -66,6 +64,6 @@ org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid -include $(top_srcdir)/git.mk diff --git a/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in b/multiload/org.mate.panel.applet.multiload.gschema.xml.in index 7ea422ea..7ea422ea 100644 --- a/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in +++ b/multiload/org.mate.panel.applet.multiload.gschema.xml.in |