build: Add some more $(AM_V_GEN)s

diff --git a/data/Makefile.am b/data/Makefile.am
index 22ecc66732c6d2a6993f90ceed9c5673a2d8c10a..883a3aa697f3ddc1cd6b774fc054866e46d883ed 100644 (file)
--- 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 0eb831d0a5f37252bd0b57ee86350048b86ae6a3..3f9ed2a3387b0809ff0380b26b144f251333902b 100644 (file)
--- 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 6b03cd8ce5b2419dadbfce60be823e59a9c7e8be..d9e4c0828a3094266b3ef3a88e409be876ad570c 100644 (file)
--- 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 8ba99bc1e908f6aad13571a7b0d488d999028ce0..bff03ee1a4807a9ce7283c66ce83717aa675ff23 100644 (file)
--- 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 b974b4f446b136319a82efad4b5a8a5f0e128a67..23bb4a35d74e31e916e0b35381f8af5b435f1f8b 100644 (file)
--- 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)