diff options
| author | lukefromdc <[email protected]> | 2023-07-11 21:28:01 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 08bb8398e0d218daaefdfe95c44940e370802508 (patch) | |
| tree | 0c567b638dd31d831141a2ca4ef355a406883e08 /cpufreq/data | |
| parent | f94afff3bd198dca2412a75053e122c55b4b48dd (diff) | |
| download | mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.bz2 mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.xz | |
Allow building all applets in or out of process
*Use --enable-in-process selector for in-process builds
*Accessx-status: mark as incompatable with wayland
*Accessx-status: Fix in-process runtime warning
*Stickynote, Geyes: style fixes
Diffstat (limited to 'cpufreq/data')
3 files changed, 27 insertions, 6 deletions
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am index c4423f90..eeceb6ac 100644 --- a/cpufreq/data/Makefile.am +++ b/cpufreq/data/Makefile.am @@ -1,35 +1,53 @@ 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@ -APPLET_LOCATION = $(libdir)/mate-applets/libmatecpufreqapplet.so +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|\@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 $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(cpufreq_gschema_in_files) \ + $(service_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 fd548154..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,6 @@ [Applet Factory] Id=CPUFreqAppletFactory -InProcess=true +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 new file mode 100644 index 00000000..ed33b33b --- /dev/null +++ b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.CPUFreqAppletFactory +Exec=@APPLET_LOCATION@ |