Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2009-08-16 19:49:16 (GMT)
committer Christian Persch <chpe@gnome.org>2009-08-16 19:49:16 (GMT)
commit3f7764002b149ab5052e1a9a55300bc9c8393062 (patch)
tree3c83a8b14cad67b3d4f90a4a84d5c63b311c66bc
parent66f2e906d69b6f76708141d757712ee5d53f01fb (diff)
build: Add some more $(AM_V_GEN)s
-rw-r--r--data/Makefile.am2
-rw-r--r--libdocument/Makefile.am4
-rw-r--r--libview/Makefile.am4
-rw-r--r--shell/ev-application.c4
-rw-r--r--thumbnailer/Makefile.am3
5 files changed, 10 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 22ecc66..883a3aa 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 0eb831d..3f9ed2a 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 6b03cd8..d9e4c08 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 8ba99bc..bff03ee 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 b974b4f..23bb4a3 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)