From: Bruno Haible <bruno@clisp.org>
Date: Wed, 6 Sep 2006 14:08:38 +0000 (+0000)
Subject: _LIBADD is reserved for object files, not -L and -l options.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=432f6b15b21916c7e9b99e5610741070c4f30c8f;p=pspp

_LIBADD is reserved for object files, not -L and -l options.
---

diff --git a/ChangeLog b/ChangeLog
index f67940971c..129879048d 100644
--- 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
diff --git a/modules/gc b/modules/gc
index fee4e77ca9..78ace10078 100644
--- a/modules/gc
+++ b/modules/gc
@@ -16,9 +16,9 @@ gl_GC
 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:
diff --git a/modules/iconvme b/modules/iconvme
index 43a8984ca2..34636ddf8f 100644
--- a/modules/iconvme
+++ b/modules/iconvme
@@ -15,7 +15,11 @@ gl_ICONVME
 
 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"