[pygobject] Quiesce automake output

[Martin Pitt <martinpitt src gnome org>]

commit 06f5ed0ebabce34eca6bc6de80221cba6453feec
Author: Martin Pitt <martinpitt gnome org>
Date:   Wed Nov 7 17:08:11 2012 +0100

    Quiesce automake output
    
    Use $(AM_V_GEN) with custom $(LINK) commands, and avoid error messages about
    existing symlinks on rebuilds.

 gi/Makefile.am          |    2 +-
 gi/_glib/Makefile.am    |    2 +-
 gi/_gobject/Makefile.am |    2 +-
 tests/Makefile.am       |    6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 53d0ddf..0489c9b 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -119,7 +119,7 @@ _gi_cairo_la_LDFLAGS = \
 # build directory, which the Python interpreter can load
 # directly without having to know how to parse .la files.
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
 
 # if we build in a separate tree, we need to symlink the *.py files from the
 # source tree; Python does not accept the extensions and modules in different
diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
index 1f004a2..4feb06b 100644
--- a/gi/_glib/Makefile.am
+++ b/gi/_glib/Makefile.am
@@ -90,4 +90,4 @@ check-local: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks
 clean-local:
 	rm -f $(pyglib_LTLIBRARIES:.la=.so)
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
index 61762fc..d8613a9 100644
--- a/gi/_gobject/Makefile.am
+++ b/gi/_gobject/Makefile.am
@@ -84,4 +84,4 @@ check-local: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks
 clean-local:
 	rm -f $(pygobject_LTLIBRARIES:.la=.so)
 .la.so:
-	$(LN_S) .libs/$@ $@ || true
+	$(LN_S) -f .libs/$@ $@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2ab8c1d..91ed293 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,7 @@ libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
 
 # This is a hack to make sure a shared library is built
 libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS) $(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS) $(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
 
 GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
 	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
@@ -30,7 +30,7 @@ libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
 libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
 
 libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libregress_la_LDFLAGS) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS)
 
 # g-i doesn't ship these as shared libraries anymore; we build them here
 Regress-1.0.gir: libregress.la Makefile
@@ -65,7 +65,7 @@ testhelper_la_SOURCES = \
 
 # This is a hack to make sure a shared library is built
 testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
+	$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
 
 
 .la.so: