From fc3918b0f08c688d8729987c32bd9cada7259b57 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 1 Jun 2001 18:39:45 +0000 Subject: dcc, flood and notifylist aren't compiled as loadable modules anymore, no-one wants that and irssi crashes in AIX because of it. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1530 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- configure.in | 4 ++-- src/fe-common/irc/dcc/Makefile.am | 7 ++----- src/fe-common/irc/notifylist/Makefile.am | 7 ++----- src/irc/dcc/Makefile.am | 7 ++----- src/irc/flood/Makefile.am | 7 ++----- src/irc/notifylist/Makefile.am | 7 ++----- src/irc/proxy/Makefile.am | 5 +---- 7 files changed, 13 insertions(+), 31 deletions(-) diff --git a/configure.in b/configure.in index d2413c7f..ca65fe1f 100644 --- a/configure.in +++ b/configure.in @@ -617,11 +617,11 @@ for c in $CHAT_MODULES; do FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a " fi for s in `eval echo \\$${c}_MODULES`; do - CHAT_LIBS="$CHAT_LIBS ../$c/$s/.libs/lib${c}_$s.a" + CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a" module_inits="$module_inits ${c}_${s}_init();" module_deinits="${c}_${s}_deinit(); $module_deinits" if test -f $srcdir/src/fe-common/$c/$s/module.h; then - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/.libs/libfe_${c}_$s.a " + FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a " fe_module_inits="$fe_module_inits fe_${c}_${s}_init();" fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits" fi diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am index f8ac20ce..e8118602 100644 --- a/src/fe-common/irc/dcc/Makefile.am +++ b/src/fe-common/irc/dcc/Makefile.am @@ -1,7 +1,4 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libfe_irc_dcc.la - -libfe_irc_dcc_la_LDFLAGS = -avoid-version +noinst_LIBRARIES = libfe_irc_dcc.a INCLUDES = \ $(GLIB_CFLAGS) \ @@ -13,7 +10,7 @@ INCLUDES = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" -libfe_irc_dcc_la_SOURCES = \ +libfe_irc_dcc_a_SOURCES = \ fe-dcc.c \ fe-dcc-chat.c \ fe-dcc-get.c \ diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am index 595c948b..b8b9bef3 100644 --- a/src/fe-common/irc/notifylist/Makefile.am +++ b/src/fe-common/irc/notifylist/Makefile.am @@ -1,7 +1,4 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libfe_irc_notifylist.la - -libfe_irc_notifylist_la_LDFLAGS = -avoid-version +noinst_LIBRARIES = libfe_irc_notifylist.a INCLUDES = \ $(GLIB_CFLAGS) \ @@ -12,7 +9,7 @@ INCLUDES = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" -libfe_irc_notifylist_la_SOURCES = \ +libfe_irc_notifylist_a_SOURCES = \ fe-notifylist.c \ module-formats.c diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am index a1f07c7d..d59aa043 100644 --- a/src/irc/dcc/Makefile.am +++ b/src/irc/dcc/Makefile.am @@ -1,12 +1,9 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libirc_dcc.la - -libirc_dcc_la_LDFLAGS = -avoid-version +noinst_LIBRARIES = libirc_dcc.a INCLUDES = $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -libirc_dcc_la_SOURCES = \ +libirc_dcc_a_SOURCES = \ dcc.c \ dcc-chat.c \ dcc-get.c \ diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am index 1424380d..2891842b 100644 --- a/src/irc/flood/Makefile.am +++ b/src/irc/flood/Makefile.am @@ -1,12 +1,9 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libirc_flood.la - -libirc_flood_la_LDFLAGS = -avoid-version +noinst_LIBRARIES = libirc_flood.a INCLUDES = $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -libirc_flood_la_SOURCES = \ +libirc_flood_a_SOURCES = \ autoignore.c \ flood.c diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am index 1abbeb66..a5fb387e 100644 --- a/src/irc/notifylist/Makefile.am +++ b/src/irc/notifylist/Makefile.am @@ -1,12 +1,9 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libirc_notifylist.la - -libirc_notifylist_la_LDFLAGS = -avoid-version +noinst_LIBRARIES = libirc_notifylist.a INCLUDES = $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -libirc_notifylist_la_SOURCES = \ +libirc_notifylist_a_SOURCES = \ notifylist.c \ notify-commands.c \ notify-ison.c \ diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am index a8259c7f..f9c07c5e 100644 --- a/src/irc/proxy/Makefile.am +++ b/src/irc/proxy/Makefile.am @@ -1,7 +1,4 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libproxy.la - -libproxy_la_LDFLAGS = -avoid-version +noinst_LTLIBRARIES = libproxy.la INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ -- cgit v1.2.3