MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-25 23:14:13 +01:00
Code Issues Releases Wiki Activity

configure: Add EXTRA_LIBS rather than modifying LIBS here.

Browse source
This commit is contained in:
Jason Volk 2018-11-29 12:39:33 -08:00
parent 3ab6d4df79
commit d35dad46c2
5 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -1307,12 +1307,17 @@ dnl Additional linkages
dnl
dnl
AC_SUBST(EXTRA_CPPFLAGS)
AC_SUBST(EXTRA_CXXFLAGS)
AC_SUBST(EXTRA_LDFLAGS)
AC_SUBST(EXTRA_LIBS)
AM_COND_IF([MINGW],
[
], [
CXXFLAGS+=" -pthread"
LIBS+="-lpthread -latomic"
EXTRA_CXXFLAGS+=" -pthread"
EXTRA_LIBS+="-lpthread -latomic"
])
dnl ***************************************************************************

6
construct/Makefile.am
View file

@ -1,6 +1,7 @@
prefix = @prefix@
AM_CXXFLAGS = \
@EXTRA_CXXFLAGS@ \
###
AM_CPPFLAGS = \
@ -11,8 +12,11 @@ AM_CPPFLAGS = \
@SSL_CPPFLAGS@ \
@CRYPTO_CPPFLAGS@ \
@SODIUM_CPPFLAGS@ \
@MAGIC_CPPFLAGS@ \
@SNAPPY_CPPFLAGS@ \
@LZ4_CPPFLAGS@ \
@Z_CPPFLAGS@ \
@EXTRA_CPPFLAGS@ \
###
AM_LDFLAGS = \
@ -35,6 +39,7 @@ AM_LDFLAGS = \
-L$(top_srcdir)/ircd \
-L$(top_srcdir)/modules \
$(PLATFORM_LDFLAGS) \
@EXTRA_LDFLAGS@ \
###
bin_PROGRAMS = construct
@ -65,6 +70,7 @@ construct_LDADD = \
@SNAPPY_LIBS@ \
@LZ4_LIBS@ \
@Z_LIBS@ \
@EXTRA_LIBS@ \
###
construct_SOURCES = \

2
include/ircd/Makefile.am
View file

@ -12,9 +12,11 @@ AM_CPPFLAGS = \
@SNAPPY_CPPFLAGS@ \
@LZ4_CPPFLAGS@ \
@Z_CPPFLAGS@ \
@EXTRA_CPPFLAGS@ \
###
AM_CXXFLAGS = \
@EXTRA_CXXFLAGS@ \
###
if GCC

4
ircd/Makefile.am
View file

@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign
libircddir = @libdir@
AM_CXXFLAGS = \
@EXTRA_CXXFLAGS@ \
###
AM_CPPFLAGS = \
@ -18,6 +19,7 @@ AM_CPPFLAGS = \
@LZ4_CPPFLAGS@ \
@Z_CPPFLAGS@ \
-include ircd/ircd.pic.h \
@EXTRA_CPPFLAGS@ \
###
if MINGW
@ -45,6 +47,7 @@ AM_LDFLAGS = \
-Wl,-z -Wl,nodlopen \
-Wl,-z -Wl,now \
$(PLATFORM_LDFLAGS) \
@EXTRA_LDFLAGS@ \
###
libircd_LTLIBRARIES = libircd.la
@ -74,6 +77,7 @@ libircd_la_LIBADD = \
@SNAPPY_LIBS@ \
@LZ4_LIBS@ \
@Z_LIBS@ \
@EXTRA_LIBS@ \
###
# Since this is a GNU C++ project we assume the non-standard respect for

18
modules/Makefile.am
View file

@ -4,23 +4,27 @@
#
AM_CXXFLAGS = \
@EXTRA_CXXFLAGS@ \
###
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
@ROCKSDB_CPPFLAGS@ \
@JS_CPPFLAGS@ \
@BOOST_CPPFLAGS@ \
@SSL_CPPFLAGS@ \
@CRYPTO_CPPFLAGS@ \
@SODIUM_CPPFLAGS@ \
@MAGIC_CPPFLAGS@ \
@SNAPPY_CPPFLAGS@ \
@LZ4_CPPFLAGS@ \
@Z_CPPFLAGS@ \
-include $(top_srcdir)/include/ircd/ircd.pic.h \
-include $(top_srcdir)/include/ircd/mods/mapi.h \
@EXTRA_CPPFLAGS@ \
###
AM_LDFLAGS = \
-L$(top_srcdir)/ircd \
@JS_LDFLAGS@ \
@BOOST_LDFLAGS@ \
###
AM_LDFLAGS += \
-avoid-version \
-module \
-Wl,-fuse-ld=gold \
@ -31,7 +35,9 @@ AM_LDFLAGS += \
-Wl,--gc-sections \
-Wl,--icf=all \
-Wl,--rosegment \
-L$(top_srcdir)/ircd \
$(PLATFORM_LDFLAGS) \
@EXTRA_LDFLAGS@ \
# -Wl,--no-undefined \
# -export-symbols-regex IRCD_MODULE* \
# -export-symbols-regex * \