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

1 files changed, 46 insertions, 45 deletions

diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 8324fe9e..e02b612d 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -5,68 +5,70 @@ endif
 SUBDIRS = $(selector_SUBDIR)
 
 AM_CPPFLAGS = \
-	$(MATE_APPLETS4_CFLAGS)
-
-cpufreq_libdir= $(pkglibdir)
-cpufreq_lib_LTLIBRARIES=libmatecpufreqapplet.la
-
-libmatecpufreqapplet_la_CPPFLAGS = \
-	-I$(top_builddir) \
-	-I$(top_srcdir) \
-	-DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
 	-DCPUFREQ_RESOURCE_PATH=\""/org/mate/mate-applets/cpufreq/"\" \
 	$(NULL)
 
-libmatecpufreqapplet_la_CFLAGS = \
+AM_CFLAGS =				\
 	$(MATE_APPLETS4_CFLAGS)		\
 	$(GIO_CFLAGS) \
 	$(WARN_CFLAGS) \
-	$(AM_CFLAGS) \
 	$(NULL)
 
-libmatecpufreqapplet_la_SOURCES = \
-	cpufreq-applet.c        \
-    cpufreq-applet.h        \
+BUILT_SOURCES = 		\
+	cpufreq-resources.c	\
+	cpufreq-resources.h	\
+	$(NULL)
+APPLET_SOURCES =			\
+	cpufreq-applet.c		\
+	cpufreq-applet.h		\
 	cpufreq-utils.c			\
-    cpufreq-utils.h			\
-	cpufreq-prefs.c         \
-    cpufreq-prefs.h         \
+	cpufreq-utils.h			\
+	cpufreq-prefs.c			\
+	cpufreq-prefs.h			\
 	cpufreq-selector.c		\
-    cpufreq-selector.h		\
-	cpufreq-popup.c         \
-    cpufreq-popup.h			\
-	cpufreq-monitor.c       \
-    cpufreq-monitor.h	    \
+	cpufreq-selector.h		\
+	cpufreq-popup.c			\
+	cpufreq-popup.h			\
+	cpufreq-monitor.c		\
+	cpufreq-monitor.h		\
 	cpufreq-monitor-factory.c	\
-    cpufreq-monitor-factory.h   \
-    cpufreq-resources.c     \
-    cpufreq-resources.h    \
+	cpufreq-monitor-factory.h	\
 	$(NULL)
 
-libmatecpufreqapplet_la_LDFLAGS = \
-	-module -avoid-version \
-	$(WARN_LDFLAGS) \
-	$(AM_LDFLAGS) \
+if HAVE_LIBCPUFREQ
+APPLET_SOURCES +=			\
+	cpufreq-monitor-libcpufreq.c	\
+	cpufreq-monitor-libcpufreq.h	\
 	$(NULL)
+else
+APPLET_SOURCES +=			\
+	cpufreq-monitor-cpuinfo.c	\
+	cpufreq-monitor-cpuinfo.h	\
+	cpufreq-monitor-sysfs.c		\
+	cpufreq-monitor-sysfs.h		\
+	$(NULL)
+endif
 
-libmatecpufreqapplet_la_LIBADD = \
+APPLET_LIBS = \
 	$(MATE_APPLETS4_LIBS)		\
 	$(LIBCPUFREQ_LIBS) \
 	$(NULL)
 
-if HAVE_LIBCPUFREQ
-libmatecpufreqapplet_la_SOURCES += \
-	cpufreq-monitor-libcpufreq.c \
-	cpufreq-monitor-libcpufreq.h \
-	$(NULL)
-else
-libmatecpufreqapplet_la_SOURCES += \
-	cpufreq-monitor-cpuinfo.c \
-	cpufreq-monitor-cpuinfo.h \
-	cpufreq-monitor-sysfs.c \
-	cpufreq-monitor-sysfs.h \
-	$(NULL)
-endif
+
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-cpufreq-applet.la
+nodist_libmate_cpufreq_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_cpufreq_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_cpufreq_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_cpufreq_applet_la_LDFLAGS = -module -avoid-version
+libmate_cpufreq_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mate-cpufreq-applet
+nodist_mate_cpufreq_applet_SOURCES = $(BUILT_SOURCES)
+mate_cpufreq_applet_SOURCES = $(APPLET_SOURCES)
+mate_cpufreq_applet_CFLAGS = $(AM_CFLAGS)
+mate_cpufreq_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
 
 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 $<
@@ -75,8 +77,7 @@ cpufreq-resources.h: $(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 = \
-	cpufreq-resources.c		\
-	cpufreq-resources.h     \
+	$(BUILT_SOURCES)	\
 	$(NULL)
 
 -include $(top_srcdir)/git.mk