1 files changed, 57 insertions, 30 deletions
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 86b18674..e02b612d 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -6,43 +6,69 @@ SUBDIRS = $(selector_SUBDIR)
 
 AM_CPPFLAGS = \
 	-DCPUFREQ_RESOURCE_PATH=\""/org/mate/mate-applets/cpufreq/"\" \
-	$(MATE_APPLETS4_CFLAGS)
+	$(NULL)
 
-libexec_PROGRAMS = mate-cpufreq-applet
-
-BUILT_SOURCES = \
-	cpufreq-resources.c		cpufreq-resources.h
-
-nodist_mate_cpufreq_applet_SOURCES = \
-	$(BUILT_SOURCES)
+AM_CFLAGS =				\
+	$(MATE_APPLETS4_CFLAGS)		\
+	$(GIO_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(NULL)
 
-mate_cpufreq_applet_SOURCES = \
-	cpufreq-applet.c        	cpufreq-applet.h        	\
-	cpufreq-utils.c			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-monitor-factory.c	cpufreq-monitor-factory.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-selector.c		\
+	cpufreq-selector.h		\
+	cpufreq-popup.c			\
+	cpufreq-popup.h			\
+	cpufreq-monitor.c		\
+	cpufreq-monitor.h		\
+	cpufreq-monitor-factory.c	\
+	cpufreq-monitor-factory.h	\
+	$(NULL)
 
 if HAVE_LIBCPUFREQ
-mate_cpufreq_applet_SOURCES += \
-	cpufreq-monitor-libcpufreq.c \
-	cpufreq-monitor-libcpufreq.h
+APPLET_SOURCES +=			\
+	cpufreq-monitor-libcpufreq.c	\
+	cpufreq-monitor-libcpufreq.h	\
+	$(NULL)
 else
-mate_cpufreq_applet_SOURCES += \
-	cpufreq-monitor-cpuinfo.c \
-	cpufreq-monitor-cpuinfo.h \
-	cpufreq-monitor-sysfs.c \
-	cpufreq-monitor-sysfs.h
+APPLET_SOURCES +=			\
+	cpufreq-monitor-cpuinfo.c	\
+	cpufreq-monitor-cpuinfo.h	\
+	cpufreq-monitor-sysfs.c		\
+	cpufreq-monitor-sysfs.h		\
+	$(NULL)
 endif
 
-mate_cpufreq_applet_CFLAGS =		\
-	${WARN_CFLAGS}
+APPLET_LIBS = \
+	$(MATE_APPLETS4_LIBS)		\
+	$(LIBCPUFREQ_LIBS) \
+	$(NULL)
 
-mate_cpufreq_applet_LDADD =		\
-	$(MATE_APPLETS4_LIBS)   	\
-	$(LIBCPUFREQ_LIBS)
+
+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 $<
@@ -51,6 +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 = \
-	$(BUILT_SOURCES)
+	$(BUILT_SOURCES)	\
+	$(NULL)
 
 -include $(top_srcdir)/git.mk