From 9ff63b9503e30df1c6c93182972f7c4bed12a344 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 14 Nov 2020 09:02:39 +0000 Subject: [PATCH] fixed build files regarding -lm --- hawk/bin/Makefile.am | 7 +++++++ hawk/t/Makefile.am | 2 +- hawk/t/Makefile.in | 7 ++++--- hawk/tools/Makefile.am | 2 +- hawk/tools/Makefile.in | 3 +-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hawk/bin/Makefile.am b/hawk/bin/Makefile.am index 6e0a6144..133f021f 100644 --- a/hawk/bin/Makefile.am +++ b/hawk/bin/Makefile.am @@ -14,6 +14,13 @@ LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir) CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -no-undefined + +## +## -lm may get omitted from dependency_libs in libhawk.la. +## the generated libtool in the build directory may include -lm in postdeps +## dependency_libs excludes items in postdeps. +## specify -lm explicitly to satisfy dependency regardless of libtool behavior. +## LIBADD_BIN_COMMON = $(LIBM) bin_PROGRAMS = hawk diff --git a/hawk/t/Makefile.am b/hawk/t/Makefile.am index 795960c8..420a929c 100644 --- a/hawk/t/Makefile.am +++ b/hawk/t/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I$(includedir) AM_LDFLAGS = -L$(abs_builddir)/../lib -L$(libdir) -LDADD = +LDADD = $(LIBM) check_SCRIPTS = h-001.hawk h-002.hawk ##noinst_SCRIPTS = $(check_SCRIPTS) diff --git a/hawk/t/Makefile.in b/hawk/t/Makefile.in index 010f2a60..0e911804 100644 --- a/hawk/t/Makefile.in +++ b/hawk/t/Makefile.in @@ -110,14 +110,15 @@ CONFIG_CLEAN_VPATH_FILES = am_t_001_OBJECTS = t-001.$(OBJEXT) t_001_OBJECTS = $(am_t_001_OBJECTS) t_001_LDADD = $(LDADD) -t_001_DEPENDENCIES = +am__DEPENDENCIES_1 = +t_001_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = am_t_002_OBJECTS = t-002.$(OBJEXT) t_002_OBJECTS = $(am_t_002_OBJECTS) -am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) am_t_003_OBJECTS = t-003.$(OBJEXT) t_003_OBJECTS = $(am_t_003_OBJECTS) am_t_004_OBJECTS = t-004.$(OBJEXT) @@ -557,7 +558,7 @@ AM_CPPFLAGS = \ -I$(includedir) AM_LDFLAGS = -L$(abs_builddir)/../lib -L$(libdir) -LDADD = +LDADD = $(LIBM) check_SCRIPTS = h-001.hawk h-002.hawk EXTRA_DIST = $(check_SCRIPTS) t_001_SOURCES = t-001.c t.h diff --git a/hawk/tools/Makefile.am b/hawk/tools/Makefile.am index 81089d2d..cad456cd 100644 --- a/hawk/tools/Makefile.am +++ b/hawk/tools/Makefile.am @@ -11,7 +11,7 @@ LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir) CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined -LIBADD_BIN_COMMON = $(LIBM) +LIBADD_BIN_COMMON = bin_PROGRAMS = uni-case uni-prop diff --git a/hawk/tools/Makefile.in b/hawk/tools/Makefile.in index 6e3e8386..71029c56 100644 --- a/hawk/tools/Makefile.in +++ b/hawk/tools/Makefile.in @@ -112,7 +112,6 @@ PROGRAMS = $(bin_PROGRAMS) am_uni_case_OBJECTS = uni_case-uni-case.$(OBJEXT) uni_case_OBJECTS = $(am_uni_case_OBJECTS) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -349,7 +348,7 @@ CPPFLAGS_ALL_COMMON = \ LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir) CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined -LIBADD_BIN_COMMON = $(LIBM) +LIBADD_BIN_COMMON = uni_case_SOURCES = uni-case.c uni_case_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) uni_case_LDFLAGS = $(LDFLAGS_ALL_COMMON)