From df7a7488950139e3884972e2363294051e33d45d Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 6 Sep 2015 21:55:35 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- cpufreq/Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'cpufreq/Makefile.am') diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am index ea9ea2aa..af18f188 100644 --- a/cpufreq/Makefile.am +++ b/cpufreq/Makefile.am @@ -1,12 +1,10 @@ SUBDIRS = help pixmaps src @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.cpufreq.gschema.xml +cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in +gsettings_SCHEMAS = $(cpufreq_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' < $< > $@ - appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.in applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) @@ -37,7 +35,6 @@ CLEANFILES = \ $(applet_DATA) \ $(applet_DATA).in \ $(service_DATA) \ - $(gsettings_SCHEMAS_in) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ *.bak \ @@ -46,7 +43,7 @@ CLEANFILES = \ EXTRA_DIST = \ org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(cpufreq_gschema_in_files) \ $(builder_DATA) \ $(ui_DATA) -- cgit v1.2.1