changeset 7266:6fbc8a2aef71

_LIBADD is reserved for object files, not -L and -l options.
author Bruno Haible <bruno@clisp.org>
date Wed, 06 Sep 2006 14:08:38 +0000
parents de7ea6e9d88f
children 8dffb67501b7
files ChangeLog modules/gc modules/iconvme
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-05  Bruno Haible  <bruno@clisp.org>
+
+	* modules/gc (Makefile.am): Augment lib_LDFLAGS, not lib_LIBADD.
+	* modules/iconvme (Makefile.am): Likewise. Also handle the case of
+	not using libtool correctly.
+
 2006-09-05  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool (func_emit_lib_Makefile_am): Initialize also
--- a/modules/gc
+++ b/modules/gc
@@ -16,9 +16,9 @@
 Makefile.am:
 EXTRA_DIST += gc.h
 if GL_COND_LIBTOOL
-lib_LIBADD += $(LTLIBGCRYPT)
+lib_LDFLAGS += $(LTLIBGCRYPT)
 else
-lib_LIBADD += $(LIBGCRYPT)
+lib_LDFLAGS += $(LIBGCRYPT)
 endif
 
 Include:
--- a/modules/iconvme
+++ b/modules/iconvme
@@ -15,7 +15,11 @@
 
 Makefile.am:
 lib_SOURCES += iconvme.h iconvme.c
-lib_LIBADD += $(LTLIBICONV)
+if GL_COND_LIBTOOL
+lib_LDFLAGS += $(LTLIBICONV)
+else
+lib_LDFLAGS += $(LIBICONV)
+endif
 
 Include:
 "iconvme.h"