MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-27 19:28:52 +02:00
Code Issues Releases Wiki Activity

Various makefile cleanup.

Browse source
This commit is contained in:
Jason Volk 2017-09-08 02:43:23 -07:00
parent 9085261ef4
commit 85b699c286
4 changed files with 49 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
charybdis/Makefile.am
View file

@ -4,7 +4,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
@ROCKSDB_CPPFLAGS@ \
@JS_CPPFLAGS@ \
@BOOST_CPPFLAGS@
@BOOST_CPPFLAGS@ \
###
AM_LDFLAGS = \
-dlopen self \
@ -15,7 +16,8 @@ AM_LDFLAGS = \
-Wl,-z -Wl,now \
-L$(top_srcdir)/ircd \
-L$(top_srcdir)/modules \
$(PLATFORM_LDFLAGS)
$(PLATFORM_LDFLAGS) \
###
bin_PROGRAMS = charybdis
@ -23,7 +25,8 @@ charybdis_LDFLAGS = \
$(AM_LDFLAGS) \
@ROCKSDB_LDFLAGS@ \
@JS_LDFLAGS@ \
@BOOST_LDFLAGS@
@BOOST_LDFLAGS@ \
###
charybdis_LDADD = \
-lircd \
@ -32,9 +35,11 @@ charybdis_LDADD = \
@BOOST_LIBS@ \
-lcrypto \
-lssl \
-lz
-lz \
###
charybdis_SOURCES = \
lgetopt.cc \
charybdis.cc \
console.cc \
charybdis.cc
lgetopt.cc \
###

8
include/ircd/Makefile.am
View file

@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
@BOOST_CPPFLAGS@
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
@BOOST_CPPFLAGS@ \
###
if GCC
AM_CXXFLAGS = -fpch-deps

45
ircd/Makefile.am
View file

@ -9,7 +9,8 @@ AM_CPPFLAGS = \
@ROCKSDB_CPPFLAGS@ \
@JS_CPPFLAGS@ \
@BOOST_CPPFLAGS@ \
-include ircd/ircd.h
-include ircd/ircd.h \
###
if MINGW
PLATFORM_LDFLAGS = -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
@ -22,8 +23,9 @@ AM_LDFLAGS = \
-Wl,--export-dynamic \
-Wl,--no-gnu-unique \
-Wl,-z -Wl,now \
$(PLATFORM_LDFLAGS)
# -Wl,--no-undefined
$(PLATFORM_LDFLAGS) \
# -Wl,--no-undefined \
###
libircd_LTLIBRARIES = libircd.la
@ -31,7 +33,8 @@ libircd_la_LDFLAGS = \
$(AM_LDFLAGS) \
@ROCKSDB_LDFLAGS@ \
@JS_LDFLAGS@ \
@BOOST_LDFLAGS@
@BOOST_LDFLAGS@ \
###
libircd_la_LIBADD = \
@ROCKSDB_LIBS@ \
@ -39,36 +42,38 @@ libircd_la_LIBADD = \
@BOOST_LIBS@ \
-lcrypto \
-lssl \
-lz
-lz \
###
libircd_la_SOURCES = \
ircd.cc \
info.cc \
exception.cc \
rfc1459.cc \
lexical.cc \
logger.cc \
fs.cc \
mods.cc \
resource.cc \
ctx.cc \
socket.cc \
client.cc \
fmt.cc \
ctx.cc \
db.cc \
locale.cc \
exception.cc \
fmt.cc \
fs.cc \
http.cc \
info.cc \
ircd.cc \
json.cc \
parse.cc \
lexical.cc \
listen.cc \
locale.cc \
logger.cc \
matrix.cc \
mods.cc \
parse.cc \
rand.cc \
resource.cc \
rfc1459.cc \
socket.cc \
###
if JS
libircd_la_SOURCES += \
js.cc \
xdr.cc
xdr.cc \
###
endif
install-data-local:

15
modules/Makefile.am
View file

@ -9,12 +9,14 @@ AM_CPPFLAGS = \
@BOOST_CPPFLAGS@ \
-include $(top_srcdir)/include/ircd/ircd.h \
-include $(top_srcdir)/include/ircd/mapi.h \
-include $(top_srcdir)/include/ircd/m.h
-include $(top_srcdir)/include/ircd/m.h \
###
AM_LDFLAGS = \
-L$(top_srcdir)/ircd \
@JS_LDFLAGS@ \
@BOOST_LDFLAGS@
@BOOST_LDFLAGS@ \
###
AM_LDFLAGS += \
-avoid-version \
@ -24,10 +26,11 @@ AM_LDFLAGS += \
-Wl,--export-dynamic \
-Wl,--no-gnu-unique \
-Wl,--no-allow-shlib-undefined \
$(PLATFORM_LDFLAGS)
# -Wl,--no-undefined
# -export-symbols-regex IRCD_MODULE*
# -export-symbols-regex *
$(PLATFORM_LDFLAGS) \
# -Wl,--no-undefined \
# -export-symbols-regex IRCD_MODULE* \
# -export-symbols-regex * \
###
moduledir=@moduledir@
root_la_SOURCES = root.cc