summaryrefslogtreecommitdiff
path: root/cpufreq/data
diff options
context:
space:
mode:
Diffstat (limited to 'cpufreq/data')
-rw-r--r--cpufreq/data/Makefile.am36
-rw-r--r--cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in3
-rw-r--r--cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in2
3 files changed, 26 insertions, 15 deletions
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am
index b08d6345..eeceb6ac 100644
--- a/cpufreq/data/Makefile.am
+++ b/cpufreq/data/Makefile.am
@@ -1,30 +1,40 @@
NULL =
-cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
-gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
+applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
+
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
@GSETTINGS_RULES@
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-cpufreq-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/mate-cpufreq-applet
+endif !ENABLE_IN_PROCESS
+
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)|" \
- $< > $@
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
+ -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)
+if !ENABLE_IN_PROCESS
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
-org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
+$(service_DATA): $(service_in_files) Makefile
$(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ $< > $@
+endif !ENABLE_IN_PROCESS
CLEANFILES = \
$(applet_DATA) \
@@ -37,7 +47,7 @@ CLEANFILES = \
EXTRA_DIST = \
$(applet_in_files).in \
$(service_in_files) \
- $(cpufreq_gschema_in_files) \
+ $(gschema_in_files) \
cpufreq-applet-menu.xml \
cpufreq-preferences.ui \
cpufreq-resources.gresource.xml \
diff --git a/cpufreq/data/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..4ce2aec3 100644
--- a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+++ b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,7 @@
[Applet Factory]
Id=CPUFreqAppletFactory
-Location=@LIBEXECDIR@/mate-cpufreq-applet
+InProcess=@APPLET_IN_PROCESS@
+Location=@APPLET_LOCATION@
Name=CPU Frequency Scaling Monitor
Description=Monitor the CPU Frequency Scaling
diff --git a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
index a04c672b..ed33b33b 100644
--- a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
+++ b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.CPUFreqAppletFactory
-Exec=@LIBEXECDIR@/mate-cpufreq-applet
+Exec=@APPLET_LOCATION@