[farsight2/master] Update common and use shave

Olivier Crête olivier.crete at collabora.co.uk
Tue Apr 28 13:49:40 PDT 2009


---
 common                   |    2 +-
 configure.ac             |    3 +++
 docs/libs/Makefile.am    |    4 ++--
 docs/plugins/Makefile.am |    4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common b/common
index e7d9928..227a993 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e7d9928e8e6bc01e9a93e07879d28ca68ed16321
+Subproject commit 227a99369534a60cd1d9c870885edd8c545a8722
diff --git a/configure.ac b/configure.ac
index 43992e0..77a8dbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,6 +368,7 @@ if test "x$HAVE_GUPNP" = "xyes"; then
    AC_DEFINE(HAVE_GUPNP,,[Have the GUPnP IGD library])
 fi
 
+SHAVE_INIT([common],[enable])
 
 dnl *** output files ***
 
@@ -377,6 +378,8 @@ farsight2.pc
 common/Makefile
 common/m4/Makefile
 common-modified/Makefile
+common/shave
+common/shave-libtool
 gst/Makefile
 gst/fsrtpconference/Makefile
 gst/funnel/Makefile
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 8b7f98e..a8b53fb 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -68,8 +68,8 @@ GTKDOC_LIBS = -static \
 	$(GST_BASE_LIBS) \
 	$(GCOV_LIBS)
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index fe41c02..72175a3 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -115,8 +115,8 @@ GTKDOC_LIBS = \
 	$(top_builddir)/gst/fsrtpconference/libfsrtpconference_doc.la \
 	$(GST_BASE_LIBS) 
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
-- 
1.5.6.5




More information about the farsight-commits mailing list