1 files changed, 38 insertions, 17 deletions
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 514c92eb..6f51c130 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 SUBDIRS = pixmaps docs
 
 applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in
@@ -16,9 +18,11 @@ AM_CPPFLAGS = \
 ${WARN_CFLAGS} \
 $(NULL)
 
-libexec_PROGRAMS = stickynotes-applet
-
-stickynotes_applet_SOURCES = \
+BUILT_SOURCES = \
+ sticky-notes-resources.c \
+ sticky-notes-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
 util.h \
 util.c \
 stickynotes.h \
@@ -29,11 +33,9 @@ stickynotes_applet_SOURCES = \
 stickynotes_callbacks.c \
 stickynotes_applet.c \
 stickynotes_applet_callbacks.c \
- sticky-notes-resources.c \
- sticky-notes-resources.h \
 $(NULL)
 
-stickynotes_applet_LDADD = \
+APPLET_LIBS = \
 $(STICKYNOTES_LIBS) \
 $(MATE_APPLETS4_LIBS) \
 $(LIBWNCK_LIBS) \
@@ -41,6 +43,31 @@ stickynotes_applet_LDADD = \
 -lX11 \
 $(NULL)
 
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-stickynotes-applet.so
+pkglib_LTLIBRARIES = libmate-stickynotes-applet.la
+nodist_libmate_stickynotes_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_stickynotes_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_stickynotes_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_stickynotes_applet_la_LDFLAGS = -module -avoid-version
+libmate_stickynotes_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/stickynotes-applet
+libexec_PROGRAMS = stickynotes-applet
+nodist_stickynotes_applet_SOURCES = $(BUILT_SOURCES)
+stickynotes_applet_SOURCES = $(APPLET_SOURCES)
+stickynotes_applet_CFLAGS = $(AM_CFLAGS)
+stickynotes_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
+
 stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in
 gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -56,21 +83,14 @@ 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_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.StickyNotesAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
-
 CLEANFILES = \
 $(applet_DATA) \
 $(applet_in_files) \
@@ -79,6 +99,7 @@ CLEANFILES = \
 sticky-notes-resources.c \
 sticky-notes-resources.h \
 *.gschema.valid \
+ $(BUILT_SOURCES) \
 $(NULL)
 
 endif