From e605ad9679b583bf7e09afe00daf23e0dfa6c823 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 30 Oct 2018 06:55:47 +0100 Subject: [PATCH] build: fix use of gnulib Make variables Reported by Kiyoshi Kanazawa. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00048.html * lib/local.mk (lib_libbison_a_LIBADD): Merge into... * src/local.mk (src_bison_LDADD): here. --- THANKS | 1 + lib/local.mk | 9 --------- src/local.mk | 10 ++++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/THANKS b/THANKS index 3437e808..7254bb3f 100644 --- a/THANKS +++ b/THANKS @@ -84,6 +84,7 @@ Juan Manuel Guerrero juan.guerrero@gmx.de Kees Zeelenberg kzlg@users.sourceforge.net Keith Browne kbrowne@legato.com Ken Moffat zarniwhoop@ntlworld.com +Kiyoshi Kanazawa yoi_no_myoujou@yahoo.co.jp Laurent Mascherpa laurent.mascherpa@epita.fr Lie Yan lie.yan@kaust.edu.sa Magnus Fromreide magfr@lysator.liu.se diff --git a/lib/local.mk b/lib/local.mk index aec635a8..18c0953d 100644 --- a/lib/local.mk +++ b/lib/local.mk @@ -45,15 +45,6 @@ lib_libbison_a_SOURCES += \ lib/path-join.h \ lib/path-join.c -lib_libbison_a_LIBADD += \ - $(ISNAND_LIBM) \ - $(ISNANF_LIBM) \ - $(ISNANL_LIBM) \ - $(LDEXPL_LIBM) \ - $(LDEXP_LIBM) \ - $(LIB_CLOCK_GETTIME) \ - $(LIB_GETHRXTIME) - # The Yacc compatibility library. if ENABLE_YACC lib_LIBRARIES = lib/liby.a diff --git a/src/local.mk b/src/local.mk index 0651aac1..6d5adfd9 100644 --- a/src/local.mk +++ b/src/local.mk @@ -104,9 +104,19 @@ BUILT_SOURCES += \ src/scan-gram.c \ src/scan-skel.c +# Although conceptually most of these guys would make more sense in the +# definition of libbison, beware that they might expand as flags such as +# `-lm`. Keep them here. Or use a Libtool convenience library. src_bison_LDADD = \ + $(ISNAND_LIBM) \ + $(ISNANF_LIBM) \ + $(ISNANL_LIBM) \ + $(LDEXPL_LIBM) \ + $(LDEXP_LIBM) \ $(LIBINTL) \ $(LIBTHREAD) \ + $(LIB_CLOCK_GETTIME) \ + $(LIB_GETHRXTIME) \ lib/libbison.a