From 3f7764002b149ab5052e1a9a55300bc9c8393062 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sun, 16 Aug 2009 21:49:16 +0200
Subject: [PATCH] build: Add some more $(AM_V_GEN)s

---
 data/Makefile.am        | 2 --
 libdocument/Makefile.am | 4 ++--
 libview/Makefile.am     | 4 ++--
 shell/ev-application.c  | 4 ++++
 thumbnailer/Makefile.am | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 22ecc667..883a3aa6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -116,5 +116,3 @@ EXTRA_DIST =				\
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
 	$(schema_DATA)
-
-
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 0eb831d0..3f9ed2a3 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -135,7 +135,7 @@ EXTRA_DIST = \
 if ENABLE_INTROSPECTION
 
 EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
-	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
+	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceDocument \
 	--strip-prefix=Ev \
 	--nsversion=$(EV_API_VERSION) \
@@ -165,7 +165,7 @@ EXTRA_DIST += $(gir_DATA)
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
 %.typelib: %.gir
-	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) \
+	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) \
 	--includedir=$(srcdir) \
 	--includedir=. \
 	$(G_IR_COMPILER_OPTS) \
diff --git a/libview/Makefile.am b/libview/Makefile.am
index 6b03cd8c..d9e4c082 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -101,7 +101,7 @@ EXTRA_DIST = \
 if ENABLE_INTROSPECTION
 
 EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
-	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
+	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceView \
 	--add-include-path=$(top_builddir)/libdocument \
 	--strip-prefix=Ev \
@@ -133,7 +133,7 @@ EXTRA_DIST += $(gir_DATA)
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
 %.typelib: %.gir
-	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) \
+	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) \
 	--includedir=$(srcdir) \
 	--includedir=$(top_builddir)/libdocument \
 	$(G_IR_COMPILER_OPTS) \
diff --git a/shell/ev-application.c b/shell/ev-application.c
index 8ba99bc1..bff03ee1 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -175,6 +175,8 @@ ev_application_get_instance (void)
 	return instance;
 }
 
+#if defined (WITH_SMCLIENT) || defined (ENABLE_DBUS)
+
 /* Session */
 static void
 save_session (EvApplication *application,
@@ -203,6 +205,8 @@ save_session (EvApplication *application,
 	g_free (uri_list);
 }
 
+#endif /* WITH_SMCLIENT || ENABLE_DBUS */
+
 #ifdef ENABLE_DBUS
 static void
 ev_application_save_session_crashed (EvApplication *application)
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index b974b4f4..23bb4a35 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -71,7 +71,8 @@ if GCONF_SCHEMAS_INSTALL
 	done \
 	fi
 endif
-endif
+
+endif # WITH_GCONF
 
 EXTRA_DIST =         	\
 	$(schema_files)  
-- 
2.43.0