Allow different --libtool options from multiple gnulib-tool invocations.

* gnulib-local/modules/libxml (Makefile.am): Don't test GL_COND_LIBTOOL, since
gnulib-tool already eliminates lib_LDFLAGS augmentations for non-libtool
libraries.
* libtextstyle/gnulib-local/modules/libcroco (Makefile.am): Likewise.
* libtextstyle/gnulib-local/modules/libglib (Makefile.am): Likewise.

diff --git a/gnulib-local/modules/libxml b/gnulib-local/modules/libxml
index a722b30965194be0c937f8e4c679d6677c99e019..dc6404c59362e5d17885a211a61a4eed99da6642 100644 (file)
--- a/gnulib-local/modules/libxml
+++ b/gnulib-local/modules/libxml
@@ -564,9 +564,7 @@ MOSTLYCLEANFILES += \
   libxml/xpointer.h
 MOSTLYCLEANFILES += libxml/*.h-t
 
-if GL_COND_LIBTOOL
 lib_LDFLAGS += $(LTLIBXML)
-endif
 
 Include:
 #include <libxml/DOCBparser.h>

diff --git a/libtextstyle/gnulib-local/modules/libcroco b/libtextstyle/gnulib-local/modules/libcroco
index a4b4c785bce401913f46193db84c6e863e134104..55f9c261695d8587ef7bb995a19b00c362f38b45 100644 (file)
--- a/libtextstyle/gnulib-local/modules/libcroco
+++ b/libtextstyle/gnulib-local/modules/libcroco
@@ -119,9 +119,7 @@ libcroco_rpl_la_SOURCES = \
 libcroco_rpl_la_CPPFLAGS = $(AM_CPPFLAGS) $(NO_CXX)
 libcroco_rpl_la_CFLAGS = @FOREIGN_WARN_CFLAGS@
 
-if GL_COND_LIBTOOL
 lib_LDFLAGS += $(LTLIBCROCO)
-endif
 
 Include:
 <libcroco.h>

diff --git a/libtextstyle/gnulib-local/modules/libglib b/libtextstyle/gnulib-local/modules/libglib
index 1e80de5748704705e3e390796b7c1aeab7cbd218..813eca4861f82b75206a9d4003413e5e03ad565c 100644 (file)
--- a/libtextstyle/gnulib-local/modules/libglib
+++ b/libtextstyle/gnulib-local/modules/libglib
@@ -139,9 +139,7 @@ MOSTLYCLEANFILES += \
   glib/gtypes.h
 MOSTLYCLEANFILES += glib.h-t glibconfig.h-t glib/*.h-t
 
-if GL_COND_LIBTOOL
 lib_LDFLAGS += $(LTLIBGLIB)
-endif
 
 Include:
 #include <glib.h>