Import upstream version 0.3.90

2 files changed, 39 insertions, 35 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 7e851a7..3b8de1f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,6 +18,15 @@ gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = indicator-session.convert
 
+EXTRA_DIST =					\
+	$(service_in_files)			\
+	$(gsettings_SCHEMAS:.xml=.xml.in)
+
+CLEANFILES =					\
+	$(dbus_services_DATA)			\
+	$(gsettings_SCHEMAS)
+
+if BUILD_GTKLOGOUTHELPER
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in
@@ -37,14 +46,9 @@ logout_helper_desktop_files = \
 	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
 logout_helper_DATA = $(logout_helper_desktop_files)
 
-EXTRA_DIST =					\
-	$(service_in_files)			\
-	$(gsettings_SCHEMAS:.xml=.xml.in) \
+EXTRA_DIST +=					\
 	$(logout_helper_desktop_in_in_files)
 
-
-CLEANFILES =					\
-	$(dbus_services_DATA)			\
-	$(gsettings_SCHEMAS) \
+CLEANFILES +=					\
 	$(logout_helper_desktop_files)
-
+endif
diff --git a/data/Makefile.in b/data/Makefile.in
index 388d645..e3a40c5 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -34,6 +34,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_in_in_files)
+
+@BUILD_GTKLOGOUTHELPER_TRUE@am__append_2 = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_files)
+
 subdir = data
 DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -285,27 +291,21 @@ dbus_services_DATA = $(service_in_files:.service.in=.service)
 gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = indicator-session.convert
-logout_helper_desktop_in_in_files = \
-	indicator-session-lock-screen.desktop.in.in \
-	indicator-session-logout.desktop.in.in \
-	indicator-session-restart.desktop.in.in \
-	indicator-session-shutdown.desktop.in.in
-
-logout_helperdir = $(datadir)/applications
-logout_helper_desktop_files = \
-	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
-
-logout_helper_DATA = $(logout_helper_desktop_files)
-EXTRA_DIST = \
-	$(service_in_files)			\
-	$(gsettings_SCHEMAS:.xml=.xml.in) \
-	$(logout_helper_desktop_in_in_files)
-
-CLEANFILES = \
-	$(dbus_services_DATA)			\
-	$(gsettings_SCHEMAS) \
-	$(logout_helper_desktop_files)
-
+EXTRA_DIST = $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in) \
+	$(am__append_1)
+CLEANFILES = $(dbus_services_DATA) $(gsettings_SCHEMAS) \
+	$(am__append_2)
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_in_in_files = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-lock-screen.desktop.in.in \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-logout.desktop.in.in \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-restart.desktop.in.in \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-shutdown.desktop.in.in
+
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helperdir = $(datadir)/applications
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_files = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
+
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_DATA = $(logout_helper_desktop_files)
 all: all-recursive
 
 .SUFFIXES:
@@ -730,13 +730,13 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \
 
 @GSETTINGS_RULES@
 
-@INTLTOOL_DESKTOP_RULE@
+@BUILD_GTKLOGOUTHELPER_TRUE@@INTLTOOL_DESKTOP_RULE@
 
-%.desktop.in: %.desktop.in.in
-	sed \
-		-e "s|\@libexecdir\@|$(libexecdir)|" \
-		-e "s|\@bindir\@|$(bindir)|" \
-		$< > $@
+@BUILD_GTKLOGOUTHELPER_TRUE@%.desktop.in: %.desktop.in.in
+@BUILD_GTKLOGOUTHELPER_TRUE@	sed \
+@BUILD_GTKLOGOUTHELPER_TRUE@		-e "s|\@libexecdir\@|$(libexecdir)|" \
+@BUILD_GTKLOGOUTHELPER_TRUE@		-e "s|\@bindir\@|$(bindir)|" \
+@BUILD_GTKLOGOUTHELPER_TRUE@		$< > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.