cpufreq: Add data dir

11 files changed, 56 insertions, 54 deletions

diff --git a/configure.ac b/configure.ac
index 3c9e7b46..a53924cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,8 +598,9 @@ trashapplet/data/Makefile
 trashapplet/src/Makefile
 trashapplet/docs/Makefile
 cpufreq/Makefile
+cpufreq/data/Makefile
+cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml
 cpufreq/src/Makefile
-cpufreq/org.mate.panel.applet.cpufreq.gschema.xml
 cpufreq/src/cpufreq-selector/Makefile
 cpufreq/pixmaps/Makefile
 cpufreq/help/Makefile
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 8fb1386f..1fe1e1c9 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -1,48 +1,3 @@
-NULL =
-
-SUBDIRS = help pixmaps src
-
-cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
-gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
-@GSETTINGS_RULES@
-
-appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
-
-$(applet_DATA): $(applet_in_files) Makefile
-	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
-CLEANFILES =				\
-	$(applet_DATA)			\
-	$(applet_in_files)		\
-	$(service_DATA)			\
-	$(gsettings_SCHEMAS)		\
-	*.gschema.valid			\
-	$(NULL)
-
-EXTRA_DIST =				\
-	$(applet_in_files).in		\
-	$(service_in_files)		\
-	$(cpufreq_gschema_in_files)	\
-	cpufreq-applet-menu.xml		\
-	cpufreq-preferences.ui		\
-	cpufreq-resources.gresource.xml	\
-	$(NULL)
+SUBDIRS = help pixmaps data src
 
 -include $(top_srcdir)/git.mk
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am
new file mode 100644
index 00000000..b08d6345
--- /dev/null
+++ b/cpufreq/data/Makefile.am
@@ -0,0 +1,46 @@
+NULL =
+
+cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
+gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
+@GSETTINGS_RULES@
+
+appletdir       = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+	$(AM_V_GEN)sed \
+            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+            $< > $@
+
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            $< > $@
+
+CLEANFILES =				\
+	$(applet_DATA)			\
+	$(applet_in_files)		\
+	$(service_DATA)			\
+	$(gsettings_SCHEMAS)		\
+	*.gschema.valid			\
+	$(NULL)
+
+EXTRA_DIST =				\
+	$(applet_in_files).in		\
+	$(service_in_files)		\
+	$(cpufreq_gschema_in_files)	\
+	cpufreq-applet-menu.xml		\
+	cpufreq-preferences.ui		\
+	cpufreq-resources.gresource.xml	\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/cpufreq/cpufreq-applet-menu.xml b/cpufreq/data/cpufreq-applet-menu.xml
index 98375818..98375818 100644
--- a/cpufreq/cpufreq-applet-menu.xml
+++ b/cpufreq/data/cpufreq-applet-menu.xml
diff --git a/cpufreq/cpufreq-preferences.ui b/cpufreq/data/cpufreq-preferences.ui
index f155f73e..f155f73e 100644
--- a/cpufreq/cpufreq-preferences.ui
+++ b/cpufreq/data/cpufreq-preferences.ui
diff --git a/cpufreq/cpufreq-resources.gresource.xml b/cpufreq/data/cpufreq-resources.gresource.xml
index 6ae8945a..6ae8945a 100644
--- a/cpufreq/cpufreq-resources.gresource.xml
+++ b/cpufreq/data/cpufreq-resources.gresource.xml
diff --git a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
index 168c6317..168c6317 100644
--- a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+++ b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
diff --git a/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
index a04c672b..a04c672b 100644
--- a/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in
+++ b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
diff --git a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in b/cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in
index 694a75f7..694a75f7 100644
--- a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
+++ b/cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index e7b42722..86b18674 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -44,11 +44,11 @@ mate_cpufreq_applet_LDADD =		\
 	$(MATE_APPLETS4_LIBS)   	\
 	$(LIBCPUFREQ_LIBS)
 
-cpufreq-resources.c: $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq --generate-dependencies $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq --generate --c-name cpufreq $<
+cpufreq-resources.c: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq/data --generate-dependencies $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $<
 
-cpufreq-resources.h: $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq --generate-dependencies $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq --generate --c-name cpufreq $<
+cpufreq-resources.h: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq/data --generate-dependencies $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $<
 
 CLEANFILES = \
 	$(BUILT_SOURCES)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4c1e044e..1855a52d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,9 +17,9 @@ command/data/command-preferences.ui
 command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
 command/data/org.mate.panel.applet.command.gschema.xml.in
 command/src/command.c
-cpufreq/cpufreq-preferences.ui
-cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
-cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
+cpufreq/data/cpufreq-preferences.ui
+cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in
 cpufreq/src/cpufreq-applet.c
 cpufreq/src/cpufreq-prefs.c
 cpufreq/src/cpufreq-monitor-cpuinfo.c