[gnome-applets/wip/muktupavels/schemas] build: move GSettings files to data/schemas

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-applets/wip/muktupavels/schemas] build: move GSettings files to data/schemas
Date: Tue, 24 Mar 2020 20:13:25 +0000 (UTC)
commit 7e5ae6bd3a2f7f9c0e91a9c8f9afcacdd6382bf9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 24 22:12:01 2020 +0200

    build: move GSettings files to data/schemas

 battstat/Makefile.am                               | 22 +-------
 charpick/Makefile.am                               | 19 +------
 command/Makefile.am                                | 16 +-----
 configure.ac                                       |  2 +-
 cpufreq/Makefile.am                                | 24 ---------
 data/Makefile.am                                   |  1 +
 data/schemas/Makefile.am                           | 58 ++++++++++++++++++++++
 ....gnome.gnome-applets.battstat.gschema.xml.in.in |  0
 ....gnome.gnome-applets.charpick.gschema.xml.in.in |  0
 ...g.gnome.gnome-applets.command.gschema.xml.in.in |  0
 ...g.gnome.gnome-applets.cpufreq.gschema.xml.in.in |  4 +-
 ...org.gnome.gnome-applets.geyes.gschema.xml.in.in |  0
 ....gnome.gnome-applets.gweather.gschema.xml.in.in |  0
 ....gnome-applets.mini-commander.gschema.xml.in.in |  0
 ...gnome.gnome-applets.multiload.gschema.xml.in.in |  0
 ....gnome.gnome-applets.netspeed.gschema.xml.in.in |  0
 ...ome.gnome-applets.stickynotes.gschema.xml.in.in |  0
 ...org.gnome.gnome-applets.timer.gschema.xml.in.in |  0
 ....gnome-applets.window-buttons.gschema.xml.in.in |  0
 ...-applets.window-picker-applet.gschema.xml.in.in |  0
 ...me.gnome-applets.window-title.gschema.xml.in.in |  0
 geyes/Makefile.am                                  | 19 +------
 gweather/Makefile.am                               | 19 +------
 mini-commander/src/Makefile.am                     | 20 +-------
 multiload/Makefile.am                              | 19 +------
 netspeed/data/Makefile.am                          | 17 -------
 sticky-notes/src/Makefile.am                       | 17 -------
 timer/src/Makefile.am                              | 22 --------
 window-buttons/Makefile.am                         | 24 +--------
 window-picker/Makefile.am                          |  3 +-
 window-picker/data/Makefile.am                     | 25 ----------
 window-title/Makefile.am                           | 20 +-------
 32 files changed, 73 insertions(+), 278 deletions(-)
---
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index ba9987851..9209c7d83 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -5,19 +5,6 @@ builder_DATA = battstat_applet.ui
 
 SUBDIRS = sounds src
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.battstat.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 APPLET_LOCATION = $(pkglibdir)/libbattery-status-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
@@ -32,20 +19,15 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 uidir = $(pkgdatadir)/ui
 ui_DATA = battstat-applet-menu.xml
 
 EXTRA_DIST =                                                   \
-       $(gsettings_schemas_in_in) \
        $(builder_DATA)                                         \
        $(ui_DATA)                                              \
        org.gnome.applets.BattstatApplet.panel-applet.in.in     \
-       $(service_in_files)                                     \
-       $(schemas_in_files)
+       $(service_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 286669c9f..61d211078 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -16,29 +16,12 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS)    \
-       *.gschema.valid 
-
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.charpick.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
+CLEANFILES = $(applet_DATA) $(applet_DATA).in
 
 uidir = $(pkgdatadir)/ui
 ui_DATA = charpick-applet-menu.xml
 
 EXTRA_DIST =                                                   \
-       $(gsettings_schemas_in_in) \
        org.gnome.applets.CharpickerApplet.panel-applet.in.in   \
        $(ui_DATA)
 
diff --git a/command/Makefile.am b/command/Makefile.am
index 59cbd7681..2bdc5e4e5 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -16,23 +16,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.command.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 EXTRA_DIST =                                                   \
-       $(gsettings_schemas_in_in) \
        org.gnome.applets.CommandApplet.panel-applet.in.in      \
        $(service_in_files)
 
diff --git a/configure.ac b/configure.ac
index 8bf4c3069..3f7abaa41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,7 @@ AC_CONFIG_FILES([
   data/icons/scalable/Makefile
   data/icons/scalable/apps/Makefile
   data/icons/scalable/status/Makefile
+  data/schemas/Makefile
 
   help/Makefile
   help/accessx-status/Makefile
@@ -416,7 +417,6 @@ AC_CONFIG_FILES([
   window-buttons/themes/Makefile
 
   window-picker/Makefile
-  window-picker/data/Makefile
   window-picker/src/Makefile
 
   window-title/Makefile
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index aa277f67f..41e4d5aef 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -1,21 +1,5 @@
 SUBDIRS = pixmaps src
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_ENUM_NAMESPACE = org.gnome.gnome-applets.cpufreq
-gsettings_ENUM_FILES = $(top_srcdir)/cpufreq/src/cpufreq-applet.h
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 APPLET_LOCATION = $(pkglibdir)/libcpu-frequency-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
@@ -37,10 +21,6 @@ uidir = $(pkgdatadir)/ui
 ui_DATA = cpufreq-applet-menu.xml
 
 CLEANFILES = \
-       $(gsettings__enum_file) \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid \
              $(applet_DATA)                    \
              $(applet_DATA).in                 \
              $(service_DATA)                   \
@@ -48,13 +28,9 @@ CLEANFILES = \
             *.gladep
 
 EXTRA_DIST = \
-       $(gsettings_schemas_in_in) \
              org.gnome.applets.CPUFreqApplet.panel-applet.in.in        \
              $(service_in_files)                               \
             $(builder_DATA)                                    \
             $(ui_DATA)
-            
-                                       
-
 
 -include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index ddb028172..845c4de36 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 SUBDIRS = \
        icons \
+       schemas \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
new file mode 100644
index 000000000..a04c6ea5f
--- /dev/null
+++ b/data/schemas/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+gsettings_schemas_in_in = \
+       org.gnome.gnome-applets.battstat.gschema.xml.in.in \
+       org.gnome.gnome-applets.charpick.gschema.xml.in.in \
+       org.gnome.gnome-applets.command.gschema.xml.in.in \
+       org.gnome.gnome-applets.geyes.gschema.xml.in.in \
+       org.gnome.gnome-applets.gweather.gschema.xml.in.in \
+       org.gnome.gnome-applets.mini-commander.gschema.xml.in.in \
+       org.gnome.gnome-applets.multiload.gschema.xml.in.in \
+       org.gnome.gnome-applets.netspeed.gschema.xml.in.in \
+       org.gnome.gnome-applets.stickynotes.gschema.xml.in.in \
+       org.gnome.gnome-applets.timer.gschema.xml.in.in \
+       org.gnome.gnome-applets.window-buttons.gschema.xml.in.in \
+       org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in \
+       org.gnome.gnome-applets.window-title.gschema.xml.in.in \
+       $(NULL)
+
+gsettings_ENUM_NAMESPACE = org.gnome.gnome-applets
+gsettings_ENUM_FILES = \
+       $(NULL)
+
+if BUILD_CPUFREQ_APPLET
+gsettings_schemas_in_in += \
+       org.gnome.gnome-applets.cpufreq.gschema.xml.in.in \
+       $(NULL)
+gsettings_ENUM_FILES += \
+       $(top_srcdir)/cpufreq/src/cpufreq-applet.h \
+       $(NULL)
+endif
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
+gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+       $(AM_V_GEN) $(SED) \
+               -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \
+               -e "s|\@PKG_DATADIR\@|$(pkgdatadir)|" \
+               -e "s|\@WB_DATA_DIR\@|$(pkgdatadir)/window-buttons-applet|" \
+               < $< > $@
+
+@GSETTINGS_RULES@
+
+EXTRA_DIST = \
+       org.gnome.gnome-applets.cpufreq.gschema.xml.in.in \
+       $(gsettings_schemas_in_in) \
+       $(NULL)
+
+CLEANFILES = \
+       *.gschema.valid \
+       $(gsettings__enum_file) \
+       $(gsettings_schemas_in) \
+       $(gsettings_SCHEMAS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in.in
similarity index 100%
rename from battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in.in
diff --git a/charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in.in
similarity index 100%
rename from charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in.in
diff --git a/command/org.gnome.gnome-applets.command.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in
similarity index 100%
rename from command/org.gnome.gnome-applets.command.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in
diff --git a/cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
similarity index 84%
rename from cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
index acc3feee3..ade5dd841 100644
--- a/cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
@@ -5,12 +5,12 @@
                        <_summary>CPU to Monitor</_summary>
                        <_description>Set the CPU to monitor. In a single processor system you don't have to 
change it.</_description>
                </key>
-               <key name="show-mode" enum="org.gnome.gnome-applets.cpufreq.CPUFreqShowMode">
+               <key name="show-mode" enum="org.gnome.gnome-applets.CPUFreqShowMode">
                        <default>'both'</default>
                        <_summary>Mode to show cpu usage</_summary>
                        <_description>A 'graphic' value means to show the applet in graphic mode (pixmap 
only), 'text' to show the applet in text mode (not to show the pixmap) and 'both' to show the applet in 
graphic and text mode.</_description>
                </key>
-               <key name="show-text-mode" enum="org.gnome.gnome-applets.cpufreq.CPUFreqShowTextMode">
+               <key name="show-text-mode" enum="org.gnome.gnome-applets.CPUFreqShowTextMode">
                        <default>'frequency-unit'</default>
                        <_summary>The type of text to display (if the text is enabled).</_summary>
                        <_description>A 'frequency' value means to show cpu frequency, 'frequency-unit' to 
show frequency and units, and 'percentage' to show percentage instead of frequency.</_description>
diff --git a/geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in.in
similarity index 100%
rename from geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in.in
diff --git a/gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in.in
similarity index 100%
rename from gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in.in
diff --git a/mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
similarity index 100%
rename from mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
diff --git a/multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in.in
similarity index 100%
rename from multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in.in
diff --git a/netspeed/data/org.gnome.gnome-applets.netspeed.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
similarity index 100%
rename from netspeed/data/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
diff --git a/sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
similarity index 100%
rename from sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
diff --git a/timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in.in
similarity index 100%
rename from timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in.in
diff --git a/window-buttons/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
similarity index 100%
rename from window-buttons/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
diff --git a/window-picker/data/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in
similarity index 100%
rename from window-picker/data/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in
diff --git a/window-title/org.gnome.gnome-applets.window-title.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in.in
similarity index 100%
rename from window-title/org.gnome.gnome-applets.window-title.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in.in
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index acd280ff8..8883d5040 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -16,27 +16,11 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 uidir = $(pkgdatadir)/ui
 ui_DATA = geyes-applet-menu.xml
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.geyes.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 themesdir = $(pkgdatadir)/geyes
 
 icons =        \
@@ -47,7 +31,6 @@ icons =       \
        gnome-eyes-applet.16.png
 
 EXTRA_DIST = \
-       $(gsettings_schemas_in_in)      \
             README.themes                                      \
             org.gnome.applets.GeyesApplet.panel-applet.in.in   \
              $(service_in_files)                               \
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index 4e2c28378..d0c708590 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -19,27 +19,10 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.gweather.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 EXTRA_DIST = \
        org.gnome.applets.GWeatherApplet.panel-applet.in.in     \
-       $(gsettings_schemas_in_in) \
        $(service_in_files)                                     \
        $(ui_DATA)
 
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index 93aea5521..57a0e8f90 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -88,30 +88,12 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 uidir = $(pkgdatadir)/ui
 ui_DATA = mini-commander-applet-menu.xml
 
 EXTRA_DIST =                                                           \
-       $(gsettings_schemas_in_in) \
        org.gnome.applets.MiniCommanderApplet.panel-applet.in.in        \
        $(service_in_files)                                             \
        $(desktop_icons_DATA)                                           \
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 979f11e46..26174cd3b 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -4,21 +4,7 @@ SUBDIRS = src
 
 APPLET_LOCATION=$(pkglibdir)/libmultiload-applet.so
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.multiload.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 EXTRA_DIST =                                                   \
-       $(gsettings_schemas_in_in) \
        org.gnome.applets.MultiLoadApplet.panel-applet.in.in    \
        $(service_in_files)                                     \
        $(ui_DATA)
@@ -39,9 +25,6 @@ $(applet_in_files): $(applet_in_files).in Makefile
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 CLEANFILES = $(applet_DATA) \
-       $(applet_DATA).in \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+       $(applet_DATA).in
 
 -include $(top_srcdir)/git.mk
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am
index ae9f2ef7e..632116b4f 100644
--- a/netspeed/data/Makefile.am
+++ b/netspeed/data/Makefile.am
@@ -17,31 +17,14 @@ $(applet_in_files): $(applet_in_files).in Makefile
 uidir = $(pkgdatadir)/ui
 ui_DATA = netspeed-menu.xml
 
-gsettings_schemas_in_in = org.gnome.gnome-applets.netspeed.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 EXTRA_DIST = \
        org.gnome.panel.Netspeed.panel-applet.in.in \
-       $(gsettings_schemas_in_in) \
        $(ui_DATA) \
        $(NULL)
 
 CLEANFILES = \
        $(applet_DATA) \
        $(applet_DATA).in \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
-
diff --git a/sticky-notes/src/Makefile.am b/sticky-notes/src/Makefile.am
index 66ff4f722..f313ff68b 100644
--- a/sticky-notes/src/Makefile.am
+++ b/sticky-notes/src/Makefile.am
@@ -51,20 +51,6 @@ libsticky_notes_applet_la_LIBADD = \
        $(XML2_LIBS) \
        $(NULL)
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.stickynotes.gschema.xml.in.in \
-       $(NULL)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 sticky-notes-resources.c: sticky-notes-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir) --generate-dependencies $(srcdir)/sticky-notes-resources.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name 
sticky_notes $<
 
@@ -72,14 +58,11 @@ sticky-notes-resources.h: sticky-notes-resources.gresource.xml $(shell $(GLIB_CO
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name 
sticky_notes $<
 
 CLEANFILES = \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid \
        sticky-notes-resources.c \
        sticky-notes-resources.h \
        $(NULL)
 
 EXTRA_DIST = \
-       $(gsettings_schemas_in_in) \
        sticky-notes-applet-menu.xml \
        sticky-notes-delete.ui \
        sticky-notes-delete-all.ui \
diff --git a/timer/src/Makefile.am b/timer/src/Makefile.am
index 6f4ef592b..bc9d15d0b 100644
--- a/timer/src/Makefile.am
+++ b/timer/src/Makefile.am
@@ -34,26 +34,4 @@ libtimer_applet_la_LIBADD = \
        $(LIBNOTIFY_LIBS) \
        $(NULL)
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.timer.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
-       $(gsettings_schemas_in_in) \
-       $(NULL)
-
-CLEANFILES = \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/window-buttons/Makefile.am b/window-buttons/Makefile.am
index f65a7aa64..743ad2ab0 100755
--- a/window-buttons/Makefile.am
+++ b/window-buttons/Makefile.am
@@ -55,36 +55,14 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-gsettings_schemas_in_in = org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN)sed \
-           -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \
-           -e "s|\@PKG_DATADIR\@|$(pkgdatadir)|" \
-           -e "s|\@WB_DATA_DIR\@|$(pkgdatadir)/window-buttons-applet|" \
-           $< > $@
-
-@GSETTINGS_RULES@
-
 # UI Builder file (Glade)
 builderdir = $(pkgdatadir)/builder
 builder_DATA = windowbuttons.ui
 
-#CLEANFILES = $(service_in_files) $(server_DATA)
-CLEANFILES = $(applet_DATA) $(applet_DATA).in \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in
 
 EXTRA_DIST = \
-       $(gsettings_schemas_in_in) \
        org.gnome.panel.WindowButtonsApplet.panel-applet.in.in \
-       $(schemas_in_files) \
        $(builder_DATA)
 
 SUBDIRS = \
diff --git a/window-picker/Makefile.am b/window-picker/Makefile.am
index 1a1ed881a..795cb746c 100644
--- a/window-picker/Makefile.am
+++ b/window-picker/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = data src
+SUBDIRS = src
 
 -include $(top_srcdir)/git.mk
-
diff --git a/window-title/Makefile.am b/window-title/Makefile.am
index 4eb92a407..d3eae46e0 100755
--- a/window-title/Makefile.am
+++ b/window-title/Makefile.am
@@ -51,32 +51,14 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.window-title.gschema.xml.in.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN)sed -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
 # UI Builder file (Glade)
 builderdir = $(pkgdatadir)/builder
 builder_DATA = windowtitle.ui
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in
 
 EXTRA_DIST = \
-       $(gsettings_schemas_in_in) \
        org.gnome.panel.WindowTitleApplet.panel-applet.in.in \
-       $(schemas_in_files) \
        $(builder_DATA)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]