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.
This commit is contained in:
Akim Demaille
2018-10-30 06:55:47 +01:00
parent 50fac71d46
commit e605ad9679
3 changed files with 11 additions and 9 deletions

1
THANKS
View File

@@ -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

View File

@@ -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

View File

@@ -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