summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-09-02 23:06:14 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-09-02 23:06:14 +0000
commitf5a50a0b6d89ff786c288453d58b7d8f01006954 (patch)
tree939b8c89dc0e69bcd00b9cecccf85a9fbc586764
parent2084f88109bd8077a287dab406b2a92bd4c39943 (diff)
cmd_* files are now shared object. This lets make -j optimize the build process a little better (it doesnt have to wait for the cmd_ files to finish so it can link commands.cpp against them), and it makes libIRCDcommands.so not be 20mb in size (which might hit file size limits on some shell hosters)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5117 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--.Makefile.inc52
-rwxr-xr-xconfigure13
2 files changed, 59 insertions, 6 deletions
diff --git a/.Makefile.inc b/.Makefile.inc
index d9cabab34..3ba7a9f53 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -62,6 +62,58 @@ install: all
-install -m 0700 src/libIRCDsnomasks.so $(LIBPATH)
-install -m 0700 src/inspircd $(BINPATH)
-install -m 0700 inspircd $(BASE) 2>/dev/null
+ -install -m 0700 src/cmd_admin.so $(LIBPATH)
+ -install -m 0700 src/cmd_away.so $(LIBPATH)
+ -install -m 0700 src/cmd_commands.so $(LIBPATH)
+ -install -m 0700 src/cmd_connect.so $(LIBPATH)
+ -install -m 0700 src/cmd_die.so $(LIBPATH)
+ -install -m 0700 src/cmd_eline.so $(LIBPATH)
+ -install -m 0700 src/cmd_gline.so $(LIBPATH)
+ -install -m 0700 src/cmd_info.so $(LIBPATH)
+ -install -m 0700 src/cmd_invite.so $(LIBPATH)
+ -install -m 0700 src/cmd_ison.so $(LIBPATH)
+ -install -m 0700 src/cmd_join.so $(LIBPATH)
+ -install -m 0700 src/cmd_kick.so $(LIBPATH)
+ -install -m 0700 src/cmd_kill.so $(LIBPATH)
+ -install -m 0700 src/cmd_kline.so $(LIBPATH)
+ -install -m 0700 src/cmd_links.so $(LIBPATH)
+ -install -m 0700 src/cmd_list.so $(LIBPATH)
+ -install -m 0700 src/cmd_loadmodule.so $(LIBPATH)
+ -install -m 0700 src/cmd_lusers.so $(LIBPATH)
+ -install -m 0700 src/cmd_map.so $(LIBPATH)
+ -install -m 0700 src/cmd_modules.so $(LIBPATH)
+ -install -m 0700 src/cmd_motd.so $(LIBPATH)
+ -install -m 0700 src/cmd_names.so $(LIBPATH)
+ -install -m 0700 src/cmd_nick.so $(LIBPATH)
+ -install -m 0700 src/cmd_notice.so $(LIBPATH)
+ -install -m 0700 src/cmd_oper.so $(LIBPATH)
+ -install -m 0700 src/cmd_part.so $(LIBPATH)
+ -install -m 0700 src/cmd_pass.so $(LIBPATH)
+ -install -m 0700 src/cmd_ping.so $(LIBPATH)
+ -install -m 0700 src/cmd_pong.so $(LIBPATH)
+ -install -m 0700 src/cmd_privmsg.so $(LIBPATH)
+ -install -m 0700 src/cmd_qline.so $(LIBPATH)
+ -install -m 0700 src/cmd_quit.so $(LIBPATH)
+ -install -m 0700 src/cmd_rehash.so $(LIBPATH)
+ -install -m 0700 src/cmd_restart.so $(LIBPATH)
+ -install -m 0700 src/cmd_rules.so $(LIBPATH)
+ -install -m 0700 src/cmd_server.so $(LIBPATH)
+ -install -m 0700 src/cmd_squit.so $(LIBPATH)
+ -install -m 0700 src/cmd_stats.so $(LIBPATH)
+ -install -m 0700 src/cmd_summon.so $(LIBPATH)
+ -install -m 0700 src/cmd_time.so $(LIBPATH)
+ -install -m 0700 src/cmd_topic.so $(LIBPATH)
+ -install -m 0700 src/cmd_trace.so $(LIBPATH)
+ -install -m 0700 src/cmd_unloadmodule.so $(LIBPATH)
+ -install -m 0700 src/cmd_user.so $(LIBPATH)
+ -install -m 0700 src/cmd_userhost.so $(LIBPATH)
+ -install -m 0700 src/cmd_users.so $(LIBPATH)
+ -install -m 0700 src/cmd_version.so $(LIBPATH)
+ -install -m 0700 src/cmd_wallops.so $(LIBPATH)
+ -install -m 0700 src/cmd_who.so $(LIBPATH)
+ -install -m 0700 src/cmd_whois.so $(LIBPATH)
+ -install -m 0700 src/cmd_whowas.so $(LIBPATH)
+ -install -m 0700 src/cmd_zline.so $(LIBPATH)
@-cp .gdbargs $(BASE)
@-cp conf/inspircd.quotes.example $(CONPATH)
@-cp conf/inspircd.rules.example $(CONPATH)
diff --git a/configure b/configure
index 89e310c73..6017ae379 100755
--- a/configure
+++ b/configure
@@ -1364,7 +1364,7 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch
EOCHEESE
$crud = $crud . " install -m 0700 m_$i.so \$(MODPATH)\n";
- ###
+###
# End Write Entry to the MakeFile
###
}
@@ -1538,7 +1538,7 @@ sub write_dynamic_makefile {
my $cmdobjs = "";
my $srcobjs = "";
foreach my $cmd (@cmdlist) {
- $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
+ $cmdobjs = $cmdobjs . "cmd_$cmd.so ";
$srcobjs = $srcobjs . "cmd_$cmd.cpp ";
}
@@ -1573,8 +1573,8 @@ RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//
all: libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
-inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
- \$(CC) -I../include $extra -Wl,--rpath -Wl,/usr/local/lib -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDaes.so libIRCDtimer.so libIRCDsnomasks.so
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so $cmdobjs
+ \$(CC) -I../include $extra -Wl,--rpath -Wl,/usr/local/lib -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDaes.so libIRCDtimer.so libIRCDsnomasks.so $cmdobjs
libIRCDsocketengine.so: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
@@ -1633,7 +1633,7 @@ libIRCDconfigreader.so: configreader.cpp ../include/base.h ../include/configread
\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
-libIRCDcommands.so: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $srcobjs
+libIRCDcommands.so: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $cmdobjs
\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o $cmdobjs
@@ -1672,8 +1672,9 @@ libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/gl
EOM
foreach my $cmd (@cmdlist) {
print FH <<ITEM;
-cmd_$cmd.o: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
+cmd_$cmd.so: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
+ \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o cmd_$cmd.so cmd_$cmd.o
ITEM
}