1 files changed, 44 insertions, 21 deletions
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 7606ab4d..1a40f61b 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -8,7 +8,7 @@ APMLIB = -lapm
 APMDIR =
 APMINC =
 else
-APMLIB = apmlib/libapm.a
+APMLIB = apmlib/libapm.la
 APMDIR = apmlib
 APMINC = -I$(srcdir)/apmlib/
 endif
@@ -22,6 +22,10 @@ SUBDIRS = docs sounds $(APMDIR)
 
 DIST_SUBDIRS = docs sounds apmlib
 
+applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.BattstatAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in
+
 AM_CPPFLAGS = \
 ${WARN_CFLAGS} \
 $(MATE_APPLETS4_CFLAGS) \
@@ -33,14 +37,14 @@ AM_CPPFLAGS = \
 -DBATTSTAT_RESOURCE_PATH=\""/org/mate/mate-applets/battstat/"\" \
 $(NULL)
 
-libexec_PROGRAMS = battstat-applet
-
-BUILT_SOURCES = battstat-resources.c battstat-resources.h
-nodist_battstat_applet_SOURCES = $(BUILT_SOURCES)
-battstat_applet_SOURCES = \
+BUILT_SOURCES = \
+ battstat-resources.c \
+ battstat-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
 battstat.h \
 battstat_applet.c \
- battstat-preferences.c \
+ battstat-preferences.c \
 battstat-preferences.h \
 power-management.c \
 acpi-linux.c \
@@ -51,7 +55,7 @@ battstat_applet_SOURCES = \
 battstat-upower.h \
 $(NULL)
 
-battstat_applet_LDADD = \
+APPLET_LIBS = \
 $(MATE_APPLETS4_LIBS) \
 $(LIBNOTIFY_LIBS) \
 $(APMLIB) \
@@ -59,37 +63,56 @@ battstat_applet_LDADD = \
 -lm \
 $(NULL)
 
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-battstat-applet.so
+
+pkglib_LTLIBRARIES = libmate-battstat-applet.la
+nodist_libmate_battstat_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_battstat_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_battstat_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_battstat_applet_la_LDFLAGS = -module -avoid-version
+libmate_battstat_applet_la_LIBADD = $(APPLET_LIBS)
+
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/battstat-applet
+
+libexec_PROGRAMS = battstat-applet
+nodist_battstat_applet_SOURCES = $(BUILT_SOURCES)
+battstat_applet_SOURCES = $(APPLET_SOURCES)
+battstat_applet_CFLAGS = $(AM_CFLAGS)
+battstat_applet_LDADD = $(APPLET_LIBS)
+
+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
+
 battstat-resources.c: battstat-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/battstat-resources.gresource.xml)
 $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name battstat $<
 
 battstat-resources.h: battstat-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/battstat-resources.gresource.xml)
 $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name battstat $<
 
-batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in
-gsettings_SCHEMAS = $(batstat_gschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.BattstatApplet.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|\@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.BattstatAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
 
 CLEANFILES = \
 $(applet_DATA) \
@@ -106,7 +129,7 @@ EXTRA_DIST = \
 battstat-resources.gresource.xml \
 $(applet_in_files).in \
 $(service_in_files) \
- $(batstat_gschema_in_files) \
+ $(gschema_in_files) \
 $(NULL)
 
 -include $(top_srcdir)/git.mk