From b9b180238721b0771ad2bbf4d21312ca7857e0cc Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 15 Nov 2020 09:22:03 +0000 Subject: [PATCH] fixed a link issue with the socket library on a certain platform --- hawk/lib/Makefile.am | 7 ++++--- hawk/lib/Makefile.in | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hawk/lib/Makefile.am b/hawk/lib/Makefile.am index 50636abc..ee0ae716 100644 --- a/hawk/lib/Makefile.am +++ b/hawk/lib/Makefile.am @@ -5,8 +5,8 @@ CPPFLAGS_ALL_COMMON = \ -I$(abs_srcdir) \ -I$(includedir) -CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS) -CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS) +CFLAGS_ALL_COMMON = +CXXFLAGS_ALL_COMMON = if ENABLE_STATIC_MODULE LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir) @@ -151,7 +151,8 @@ libhawk_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_PFMOD) libhawk_la_CFLAGS = $(CFLAGS_ALL_COMMON) libhawk_la_CXXFLAGS = $(CXXFLAGS_ALL_COMMON) libhawk_la_LDFLAGS = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined -libhawk_la_LIBADD = $(LIBM) $(PTHREAD_LIBS) +## socket() is used in gem-nwif.c and gem-nwif2.c +libhawk_la_LIBADD = $(LIBM) $(SOCKET_LIBS) libhawk_la_DEPENDENCIES = if ENABLE_LIBLTDL diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index 346b1046..019a4e84 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -564,8 +564,8 @@ CPPFLAGS_ALL_COMMON = \ -I$(abs_srcdir) \ -I$(includedir) -CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS) -CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS) +CFLAGS_ALL_COMMON = +CXXFLAGS_ALL_COMMON = @ENABLE_STATIC_MODULE_FALSE@LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(libdir) @ENABLE_STATIC_MODULE_TRUE@LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir) @WIN32_FALSE@CPPFLAGS_PFMOD = -DHAWK_DEFAULT_MODLIBDIRS=\"$(libdir)\" \ @@ -606,7 +606,7 @@ libhawk_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_PFMOD) \ libhawk_la_CFLAGS = $(CFLAGS_ALL_COMMON) libhawk_la_CXXFLAGS = $(CXXFLAGS_ALL_COMMON) libhawk_la_LDFLAGS = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined -libhawk_la_LIBADD = $(LIBM) $(PTHREAD_LIBS) $(am__append_4) \ +libhawk_la_LIBADD = $(LIBM) $(SOCKET_LIBS) $(am__append_4) \ $(am__append_5) $(am__append_6) $(am__append_10) \ $(am__append_11) $(am__append_13) libhawk_la_DEPENDENCIES = $(am__append_12) $(am__append_14)