diff --git a/Makefile.am b/Makefile.am index b33c5df3..b8b3e227 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ if BUILD_LTDL SUBDIRS += libltdl endif -SUBDIRS += src \ +SUBDIRS += ircd \ ssld \ bandb \ tools \ diff --git a/extensions/Makefile.am b/extensions/Makefile.am index dc2bd677..5be695cf 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared AM_LDFLAGS += -export-symbols-regex _mheader -LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/src/libcore.la +LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/ircd/libircd.la extensiondir=@moduledir@/extensions diff --git a/src/.depend b/ircd/.depend similarity index 100% rename from src/.depend rename to ircd/.depend diff --git a/src/.indent.pro b/ircd/.indent.pro similarity index 100% rename from src/.indent.pro rename to ircd/.indent.pro diff --git a/src/Makefile.am b/ircd/Makefile.am similarity index 90% rename from src/Makefile.am rename to ircd/Makefile.am index 56ec953c..94a4ef75 100644 --- a/src/Makefile.am +++ b/ircd/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign prefix = @prefix@ -libcoredir = @libdir@ +libircddir = @libdir@ AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include AM_LDFLAGS = -L$(top_srcdir)/libratbox/src -export-dynamic -avoid-version -no-undefined @@ -15,7 +15,7 @@ version.c: version.c.SH ../CREDITS ../include/patchlevel.h ../include/serno.h $(CP) version.c version.c.last touch version.c.SH -libcore_la_SOURCES = \ +libircd_la_SOURCES = \ bandbi.c \ blacklist.c \ cache.c \ @@ -64,12 +64,12 @@ libcore_la_SOURCES = \ tgchange.c \ version.c \ whowas.c -libcore_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -libcore_LTLIBRARIES = libcore.la +libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version +libircd_LTLIBRARIES = libircd.la bin_PROGRAMS = charybdis charybdis_SOURCES = main.c -charybdis_LDADD = libcore.la +charybdis_LDADD = libircd.la -install-exec-hook: install-libcoreLTLIBRARIES +install-exec-hook: install-libircdLTLIBRARIES $(RM) -f version.c diff --git a/src/Makefile.in b/ircd/Makefile.in similarity index 100% rename from src/Makefile.in rename to ircd/Makefile.in diff --git a/src/bandbi.c b/ircd/bandbi.c similarity index 100% rename from src/bandbi.c rename to ircd/bandbi.c diff --git a/src/blacklist.c b/ircd/blacklist.c similarity index 100% rename from src/blacklist.c rename to ircd/blacklist.c diff --git a/src/cache.c b/ircd/cache.c similarity index 100% rename from src/cache.c rename to ircd/cache.c diff --git a/src/capability.c b/ircd/capability.c similarity index 100% rename from src/capability.c rename to ircd/capability.c diff --git a/src/channel.c b/ircd/channel.c similarity index 100% rename from src/channel.c rename to ircd/channel.c diff --git a/src/chmode.c b/ircd/chmode.c similarity index 100% rename from src/chmode.c rename to ircd/chmode.c diff --git a/src/class.c b/ircd/class.c similarity index 100% rename from src/class.c rename to ircd/class.c diff --git a/src/client.c b/ircd/client.c similarity index 100% rename from src/client.c rename to ircd/client.c diff --git a/src/extban.c b/ircd/extban.c similarity index 100% rename from src/extban.c rename to ircd/extban.c diff --git a/src/getopt.c b/ircd/getopt.c similarity index 100% rename from src/getopt.c rename to ircd/getopt.c diff --git a/src/hash.c b/ircd/hash.c similarity index 100% rename from src/hash.c rename to ircd/hash.c diff --git a/src/hook.c b/ircd/hook.c similarity index 100% rename from src/hook.c rename to ircd/hook.c diff --git a/src/hostmask.c b/ircd/hostmask.c similarity index 100% rename from src/hostmask.c rename to ircd/hostmask.c diff --git a/src/ipv4_from_ipv6.c b/ircd/ipv4_from_ipv6.c similarity index 100% rename from src/ipv4_from_ipv6.c rename to ircd/ipv4_from_ipv6.c diff --git a/src/irc_dictionary.c b/ircd/irc_dictionary.c similarity index 100% rename from src/irc_dictionary.c rename to ircd/irc_dictionary.c diff --git a/src/ircd.c b/ircd/ircd.c similarity index 100% rename from src/ircd.c rename to ircd/ircd.c diff --git a/src/ircd_lexer.l b/ircd/ircd_lexer.l similarity index 100% rename from src/ircd_lexer.l rename to ircd/ircd_lexer.l diff --git a/src/ircd_parser.y b/ircd/ircd_parser.y similarity index 100% rename from src/ircd_parser.y rename to ircd/ircd_parser.y diff --git a/src/ircd_signal.c b/ircd/ircd_signal.c similarity index 100% rename from src/ircd_signal.c rename to ircd/ircd_signal.c diff --git a/src/listener.c b/ircd/listener.c similarity index 100% rename from src/listener.c rename to ircd/listener.c diff --git a/src/logger.c b/ircd/logger.c similarity index 100% rename from src/logger.c rename to ircd/logger.c diff --git a/src/match.c b/ircd/match.c similarity index 100% rename from src/match.c rename to ircd/match.c diff --git a/src/modules.c b/ircd/modules.c similarity index 100% rename from src/modules.c rename to ircd/modules.c diff --git a/src/monitor.c b/ircd/monitor.c similarity index 100% rename from src/monitor.c rename to ircd/monitor.c diff --git a/src/newconf.c b/ircd/newconf.c similarity index 100% rename from src/newconf.c rename to ircd/newconf.c diff --git a/src/operhash.c b/ircd/operhash.c similarity index 100% rename from src/operhash.c rename to ircd/operhash.c diff --git a/src/packet.c b/ircd/packet.c similarity index 100% rename from src/packet.c rename to ircd/packet.c diff --git a/src/parse.c b/ircd/parse.c similarity index 100% rename from src/parse.c rename to ircd/parse.c diff --git a/src/privilege.c b/ircd/privilege.c similarity index 100% rename from src/privilege.c rename to ircd/privilege.c diff --git a/src/ratelimit.c b/ircd/ratelimit.c similarity index 100% rename from src/ratelimit.c rename to ircd/ratelimit.c diff --git a/src/reject.c b/ircd/reject.c similarity index 100% rename from src/reject.c rename to ircd/reject.c diff --git a/src/res.c b/ircd/res.c similarity index 100% rename from src/res.c rename to ircd/res.c diff --git a/src/reslib.c b/ircd/reslib.c similarity index 100% rename from src/reslib.c rename to ircd/reslib.c diff --git a/src/restart.c b/ircd/restart.c similarity index 100% rename from src/restart.c rename to ircd/restart.c diff --git a/src/s_auth.c b/ircd/s_auth.c similarity index 100% rename from src/s_auth.c rename to ircd/s_auth.c diff --git a/src/s_conf.c b/ircd/s_conf.c similarity index 100% rename from src/s_conf.c rename to ircd/s_conf.c diff --git a/src/s_newconf.c b/ircd/s_newconf.c similarity index 100% rename from src/s_newconf.c rename to ircd/s_newconf.c diff --git a/src/s_serv.c b/ircd/s_serv.c similarity index 100% rename from src/s_serv.c rename to ircd/s_serv.c diff --git a/src/s_user.c b/ircd/s_user.c similarity index 100% rename from src/s_user.c rename to ircd/s_user.c diff --git a/src/scache.c b/ircd/scache.c similarity index 100% rename from src/scache.c rename to ircd/scache.c diff --git a/src/send.c b/ircd/send.c similarity index 100% rename from src/send.c rename to ircd/send.c diff --git a/src/snomask.c b/ircd/snomask.c similarity index 100% rename from src/snomask.c rename to ircd/snomask.c diff --git a/src/sslproc.c b/ircd/sslproc.c similarity index 100% rename from src/sslproc.c rename to ircd/sslproc.c diff --git a/src/substitution.c b/ircd/substitution.c similarity index 100% rename from src/substitution.c rename to ircd/substitution.c diff --git a/src/supported.c b/ircd/supported.c similarity index 100% rename from src/supported.c rename to ircd/supported.c diff --git a/src/tgchange.c b/ircd/tgchange.c similarity index 100% rename from src/tgchange.c rename to ircd/tgchange.c diff --git a/src/version.c.SH b/ircd/version.c.SH similarity index 100% rename from src/version.c.SH rename to ircd/version.c.SH diff --git a/src/whowas.c b/ircd/whowas.c similarity index 100% rename from src/whowas.c rename to ircd/whowas.c diff --git a/modules/Makefile.am b/modules/Makefile.am index 075b0165..93940acd 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)/libratbox/include AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared AM_LDFLAGS += -export-symbols-regex _mheader -LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/src/libcore.la +LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/ircd/libircd.la auto_load_moddir=@moduledir@/autoload