From d2192653dbf555337464846e0132c547bf3a503a Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 19 Oct 2018 16:10:49 +0200 Subject: [PATCH] build: add missing gnulib libs Reported by Denis Excoffier. * lib/local.mk, src/local.mk: here. --- THANKS | 1 + lib/local.mk | 15 ++++++++++++--- src/local.mk | 19 ++++++++----------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/THANKS b/THANKS index 7971a0c7..3437e808 100644 --- a/THANKS +++ b/THANKS @@ -42,6 +42,7 @@ David J. MacKenzie djm@gnu.org David Kastrup dak@gnu.org David Michael fedora.dm0@gmail.com Dengke Du dengke.du@windriver.com +Denis Excoffier gcc@Denis-Excoffier.org Dennis Clarke dclarke@blastwave.org Derek Clegg derek@me.com Derek M. Jones derek@knosof.co.uk diff --git a/lib/local.mk b/lib/local.mk index bf8f6f90..977afb57 100644 --- a/lib/local.mk +++ b/lib/local.mk @@ -46,9 +46,18 @@ 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 -EXTRA_LIBRARIES = lib/liby.a -lib_liby_a_SOURCES = lib/main.c lib/yyerror.c + lib_LIBRARIES = lib/liby.a + EXTRA_LIBRARIES = lib/liby.a + lib_liby_a_SOURCES = lib/main.c lib/yyerror.c endif diff --git a/src/local.mk b/src/local.mk index f1384c0c..a41a5f39 100644 --- a/src/local.mk +++ b/src/local.mk @@ -13,16 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -LDADD = \ - $(ISNAND_LIBM) \ - $(ISNANF_LIBM) \ - $(ISNANL_LIBM) \ - $(LDEXPL_LIBM) \ - $(LDEXP_LIBM) \ - $(LIBINTL) \ - $(LIBTHREAD) \ - lib/libbison.a - bin_PROGRAMS = src/bison # Prettify Automake-computed names of compiled objects. src_bison_SHORTNAME = bison @@ -114,13 +104,20 @@ BUILT_SOURCES += \ src/scan-gram.c \ src/scan-skel.c +src_bison_LDADD = \ + $(LIBINTL) \ + $(LIBTHREAD) \ + lib/libbison.a + + + ## ------ ## ## yacc. ## ## ------ ## if ENABLE_YACC -bin_SCRIPTS = src/yacc + bin_SCRIPTS = src/yacc endif EXTRA_SCRIPTS = src/yacc MOSTLYCLEANFILES += src/yacc