From fea4e2d2a848ddba8c932cf84c382443081c6611 Mon Sep 17 00:00:00 2001 From: Elizabeth Myers Date: Wed, 23 Mar 2016 13:59:10 -0500 Subject: [PATCH] modules: libircd depends on librb, so no need to include it. This triggers multiple inclusion warnings on Solaris also. --- extensions/Makefile.am | 2 +- modules/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/Makefile.am b/extensions/Makefile.am index f3a5ecbb..443c6557 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL) AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared AM_LDFLAGS += -export-symbols-regex _mheader -LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la +LIBS += $(top_srcdir)/ircd/libircd.la extensiondir=@moduledir@/extensions diff --git a/modules/Makefile.am b/modules/Makefile.am index 7193e02b..8c2fb9df 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL) AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared AM_LDFLAGS += -export-symbols-regex _mheader -LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la +LIBS += $(top_srcdir)/ircd/libircd.la auto_load_moddir=@moduledir@/autoload