diff options
| -rw-r--r-- | .Makefile.inc | 108 | ||||
| -rwxr-xr-x | configure | 58 | ||||
| -rw-r--r-- | src/commands/cmd_admin.cpp (renamed from src/cmd_admin.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_away.cpp (renamed from src/cmd_away.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_clearcache.cpp (renamed from src/cmd_clearcache.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_commands.cpp (renamed from src/cmd_commands.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_connect.cpp (renamed from src/cmd_connect.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_die.cpp (renamed from src/cmd_die.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_eline.cpp (renamed from src/cmd_eline.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_gline.cpp (renamed from src/cmd_gline.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_info.cpp (renamed from src/cmd_info.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_invite.cpp (renamed from src/cmd_invite.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_ison.cpp (renamed from src/cmd_ison.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_join.cpp (renamed from src/cmd_join.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_kick.cpp (renamed from src/cmd_kick.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_kill.cpp (renamed from src/cmd_kill.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_kline.cpp (renamed from src/cmd_kline.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_links.cpp (renamed from src/cmd_links.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_list.cpp (renamed from src/cmd_list.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_loadmodule.cpp (renamed from src/cmd_loadmodule.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_lusers.cpp (renamed from src/cmd_lusers.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_map.cpp (renamed from src/cmd_map.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_mode.cpp (renamed from src/cmd_mode.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_modules.cpp (renamed from src/cmd_modules.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_motd.cpp (renamed from src/cmd_motd.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_names.cpp (renamed from src/cmd_names.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_nick.cpp (renamed from src/cmd_nick.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_notice.cpp (renamed from src/cmd_notice.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_oper.cpp (renamed from src/cmd_oper.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_part.cpp (renamed from src/cmd_part.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_pass.cpp (renamed from src/cmd_pass.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_ping.cpp (renamed from src/cmd_ping.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_pong.cpp (renamed from src/cmd_pong.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_privmsg.cpp (renamed from src/cmd_privmsg.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_qline.cpp (renamed from src/cmd_qline.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_quit.cpp (renamed from src/cmd_quit.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_rehash.cpp (renamed from src/cmd_rehash.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_reloadmodule.cpp (renamed from src/cmd_reloadmodule.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_restart.cpp (renamed from src/cmd_restart.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_rules.cpp (renamed from src/cmd_rules.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_server.cpp (renamed from src/cmd_server.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_squit.cpp (renamed from src/cmd_squit.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_stats.cpp (renamed from src/cmd_stats.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_time.cpp (renamed from src/cmd_time.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_topic.cpp (renamed from src/cmd_topic.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_trace.cpp (renamed from src/cmd_trace.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_unloadmodule.cpp (renamed from src/cmd_unloadmodule.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_user.cpp (renamed from src/cmd_user.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_userhost.cpp (renamed from src/cmd_userhost.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_version.cpp (renamed from src/cmd_version.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_wallops.cpp (renamed from src/cmd_wallops.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_who.cpp (renamed from src/cmd_who.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_whois.cpp (renamed from src/cmd_whois.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_whowas.cpp (renamed from src/cmd_whowas.cpp) | 0 | ||||
| -rw-r--r-- | src/commands/cmd_zline.cpp (renamed from src/cmd_zline.cpp) | 0 |
55 files changed, 95 insertions, 71 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 3070d621f..367c77e22 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -99,59 +99,59 @@ install: all@EXTRA_DIR@ -install -m $(INSTMODE) src/libIRCDuserresolver.$(LIB_EXT) $(LIBPATH) -install -m $(INSTMODE) src/inspircd $(BINPATH) -install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null - -install -m $(INSTMODE) src/cmd_admin.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_away.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_clearcache.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_commands.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_connect.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_die.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_eline.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_gline.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_info.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_invite.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_ison.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_join.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_kick.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_kill.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_kline.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_links.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_list.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_loadmodule.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_lusers.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_map.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_modules.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_motd.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_names.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_nick.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_notice.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_oper.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_part.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_pass.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_ping.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_pong.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_privmsg.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_qline.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_quit.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_rehash.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_reloadmodule.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_restart.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_rules.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_server.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_squit.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_stats.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_time.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_topic.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_trace.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_unloadmodule.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_user.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_userhost.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_version.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_wallops.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_who.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_whois.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_whowas.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_zline.so $(LIBPATH) - -install -m $(INSTMODE) src/cmd_mode.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_admin.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_away.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_clearcache.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_commands.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_connect.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_die.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_eline.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_gline.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_info.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_invite.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_ison.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_join.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_kick.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_kill.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_kline.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_links.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_list.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_loadmodule.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_lusers.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_map.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_modules.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_motd.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_names.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_nick.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_notice.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_oper.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_part.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_pass.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_ping.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_pong.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_privmsg.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_qline.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_quit.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_rehash.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_reloadmodule.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_restart.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_rules.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_server.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_squit.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_stats.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_time.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_topic.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_trace.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_unloadmodule.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_user.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_userhost.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_version.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_wallops.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_who.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_whois.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_whowas.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_zline.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/cmd_mode.so $(LIBPATH) @-cp .gdbargs $(BASE) @-cp conf/inspircd.quotes.example $(CONPATH) @-cp conf/inspircd.rules.example $(CONPATH) @@ -182,7 +182,7 @@ module: clean: @echo Cleaning... - @rm -rvf src/*.so src/*.dylib src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~ src/modes/*~ src/modes/*.o src/modes/*.a src/modules/*/*.o src/modules/*/*.so + @rm -rvf src/*.so src/*.dylib src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~ src/modes/*~ src/modes/*.o src/modes/*.a src/commands/*.so src/commands/*.o src/modules/*/*.o src/modules/*/*.so @echo Completed. modclean: @@ -1332,7 +1332,7 @@ sub write_dynamic_makefile { my $i = 0; my @cmdlist = (); - opendir(DIRHANDLE, "src"); + opendir(DIRHANDLE, "src/commands"); foreach $name (sort readdir(DIRHANDLE)) { if ($name =~ /^cmd_(.+)\.cpp$/) { $cmdlist[$i++] = $1; @@ -1340,13 +1340,6 @@ sub write_dynamic_makefile { } closedir(DIRHANDLE); - my $cmdobjs = ""; - my $srcobjs = ""; - foreach my $cmd (@cmdlist) { - $cmdobjs = $cmdobjs . "cmd_$cmd.so "; - $srcobjs = $srcobjs . "cmd_$cmd.cpp "; - } - $se = "socketengine_select"; if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) { $se = "socketengine_kqueue"; @@ -1383,12 +1376,15 @@ EOM if ($config{IS_DARWIN} eq "YES") { print FH <<EOM; -all: libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDsnomasks.dylib libIRCDserver.dylib libIRCDfilelogger.dylib libIRCDuserresolver.dylib inspircd +all: libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDsnomasks.dylib libIRCDserver.dylib libIRCDfilelogger.dylib libIRCDuserresolver.dylib moo 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 $cmdobjs libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDsnomasks.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDserver.dylib libIRCDfilelogger.dylib libIRCDuserresolver.dylib +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.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDsnomasks.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDserver.dylib libIRCDfilelogger.dylib libIRCDuserresolver.dylib \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDhash.dylib libIRCDsocket.dylib libIRCDsocketengine.dylib libIRCDuserprocess.dylib libIRCDcull_list.dylib libIRCDcommand_parse.dylib libIRCDtimer.dylib libIRCDsnomasks.dylib libIRCDserver.dylib libIRCDfilelogger.dylib libIRCDuserresolver.dylib +moo: + \${MAKE} -C "commands" DIRNAME="src/commands" CC="\$(CC)" \$(MAKEARGS) + libIRCDsocketengine.dylib: $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 \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $se.cpp @@ -1496,11 +1492,14 @@ EOM } else { print FH <<EOM; -all: libIRCDtimer.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 libIRCDserver.so libIRCDfilelogger.so libIRCDuserresolver.so inspircd +all: libIRCDtimer.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 libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so libIRCDserver.so libIRCDfilelogger.so libIRCDuserresolver.so moo 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 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 libIRCDserver.so libIRCDfilelogger.so libIRCDuserresolver.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 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 libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDserver.so libIRCDfilelogger.so libIRCDuserresolver.so \$(CC) -pipe -I../include -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) $freebsd4libs -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 libIRCDtimer.so libIRCDsnomasks.so libIRCDserver.so libIRCDfilelogger.so libIRCDuserresolver.so +moo: + \${MAKE} -C "commands" DIRNAME="src/commands" CC="\$(CC)" \$(MAKEARGS) + 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 \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o @@ -1604,14 +1603,39 @@ libIRCDuserresolver.so: user_resolver.cpp ../include/base.h ../include/inspircd. EOM } + + # close main makefile + close(FH); + + # generate a list of .so + foreach my $cmd (@cmdlist) { + $cmdobjs = $cmdobjs . "cmd_$cmd.so "; + } + + # and now reopen the commands makefile + open(FH,">src/commands/Makefile") or die("Could not write src/commands/Makefile"); + print FH <<ITEM; +CC = i am cornholio +CXXFLAGS = -I../../include ${FLAGS} + +all: $cmdobjs + + +ITEM + + # now print the command file details. foreach my $cmd (@cmdlist) { print FH <<ITEM; -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) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o +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 $SHARED -o cmd_$cmd.so ITEM } - close(FH); -} +#try build a .so, no intermediate .o +# \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic $SHARED -o cmd_$cmd.so +#this works for sure +# \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp +# \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o +} +ed diff --git a/src/cmd_admin.cpp b/src/commands/cmd_admin.cpp index 0d704ba24..0d704ba24 100644 --- a/src/cmd_admin.cpp +++ b/src/commands/cmd_admin.cpp diff --git a/src/cmd_away.cpp b/src/commands/cmd_away.cpp index ce4628858..ce4628858 100644 --- a/src/cmd_away.cpp +++ b/src/commands/cmd_away.cpp diff --git a/src/cmd_clearcache.cpp b/src/commands/cmd_clearcache.cpp index cbc796bba..cbc796bba 100644 --- a/src/cmd_clearcache.cpp +++ b/src/commands/cmd_clearcache.cpp diff --git a/src/cmd_commands.cpp b/src/commands/cmd_commands.cpp index 68c5a8c78..68c5a8c78 100644 --- a/src/cmd_commands.cpp +++ b/src/commands/cmd_commands.cpp diff --git a/src/cmd_connect.cpp b/src/commands/cmd_connect.cpp index b44264123..b44264123 100644 --- a/src/cmd_connect.cpp +++ b/src/commands/cmd_connect.cpp diff --git a/src/cmd_die.cpp b/src/commands/cmd_die.cpp index 4ef9e4301..4ef9e4301 100644 --- a/src/cmd_die.cpp +++ b/src/commands/cmd_die.cpp diff --git a/src/cmd_eline.cpp b/src/commands/cmd_eline.cpp index bd9832c8a..bd9832c8a 100644 --- a/src/cmd_eline.cpp +++ b/src/commands/cmd_eline.cpp diff --git a/src/cmd_gline.cpp b/src/commands/cmd_gline.cpp index 3845c23ee..3845c23ee 100644 --- a/src/cmd_gline.cpp +++ b/src/commands/cmd_gline.cpp diff --git a/src/cmd_info.cpp b/src/commands/cmd_info.cpp index 959f04a39..959f04a39 100644 --- a/src/cmd_info.cpp +++ b/src/commands/cmd_info.cpp diff --git a/src/cmd_invite.cpp b/src/commands/cmd_invite.cpp index d5ce160ac..d5ce160ac 100644 --- a/src/cmd_invite.cpp +++ b/src/commands/cmd_invite.cpp diff --git a/src/cmd_ison.cpp b/src/commands/cmd_ison.cpp index 9289dd014..9289dd014 100644 --- a/src/cmd_ison.cpp +++ b/src/commands/cmd_ison.cpp diff --git a/src/cmd_join.cpp b/src/commands/cmd_join.cpp index b5359397d..b5359397d 100644 --- a/src/cmd_join.cpp +++ b/src/commands/cmd_join.cpp diff --git a/src/cmd_kick.cpp b/src/commands/cmd_kick.cpp index c8b505ff0..c8b505ff0 100644 --- a/src/cmd_kick.cpp +++ b/src/commands/cmd_kick.cpp diff --git a/src/cmd_kill.cpp b/src/commands/cmd_kill.cpp index 29ce56b5c..29ce56b5c 100644 --- a/src/cmd_kill.cpp +++ b/src/commands/cmd_kill.cpp diff --git a/src/cmd_kline.cpp b/src/commands/cmd_kline.cpp index 5edb414ea..5edb414ea 100644 --- a/src/cmd_kline.cpp +++ b/src/commands/cmd_kline.cpp diff --git a/src/cmd_links.cpp b/src/commands/cmd_links.cpp index 4c50b2684..4c50b2684 100644 --- a/src/cmd_links.cpp +++ b/src/commands/cmd_links.cpp diff --git a/src/cmd_list.cpp b/src/commands/cmd_list.cpp index 0e97d0db1..0e97d0db1 100644 --- a/src/cmd_list.cpp +++ b/src/commands/cmd_list.cpp diff --git a/src/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp index c6f0a611c..c6f0a611c 100644 --- a/src/cmd_loadmodule.cpp +++ b/src/commands/cmd_loadmodule.cpp diff --git a/src/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp index 04f2906ac..04f2906ac 100644 --- a/src/cmd_lusers.cpp +++ b/src/commands/cmd_lusers.cpp diff --git a/src/cmd_map.cpp b/src/commands/cmd_map.cpp index 7d391d275..7d391d275 100644 --- a/src/cmd_map.cpp +++ b/src/commands/cmd_map.cpp diff --git a/src/cmd_mode.cpp b/src/commands/cmd_mode.cpp index e0d3b4242..e0d3b4242 100644 --- a/src/cmd_mode.cpp +++ b/src/commands/cmd_mode.cpp diff --git a/src/cmd_modules.cpp b/src/commands/cmd_modules.cpp index 1ff8c1c75..1ff8c1c75 100644 --- a/src/cmd_modules.cpp +++ b/src/commands/cmd_modules.cpp diff --git a/src/cmd_motd.cpp b/src/commands/cmd_motd.cpp index 8098b2007..8098b2007 100644 --- a/src/cmd_motd.cpp +++ b/src/commands/cmd_motd.cpp diff --git a/src/cmd_names.cpp b/src/commands/cmd_names.cpp index 4049364a7..4049364a7 100644 --- a/src/cmd_names.cpp +++ b/src/commands/cmd_names.cpp diff --git a/src/cmd_nick.cpp b/src/commands/cmd_nick.cpp index 52e562d02..52e562d02 100644 --- a/src/cmd_nick.cpp +++ b/src/commands/cmd_nick.cpp diff --git a/src/cmd_notice.cpp b/src/commands/cmd_notice.cpp index 9cc846dd8..9cc846dd8 100644 --- a/src/cmd_notice.cpp +++ b/src/commands/cmd_notice.cpp diff --git a/src/cmd_oper.cpp b/src/commands/cmd_oper.cpp index bcb2991b7..bcb2991b7 100644 --- a/src/cmd_oper.cpp +++ b/src/commands/cmd_oper.cpp diff --git a/src/cmd_part.cpp b/src/commands/cmd_part.cpp index 46108eca2..46108eca2 100644 --- a/src/cmd_part.cpp +++ b/src/commands/cmd_part.cpp diff --git a/src/cmd_pass.cpp b/src/commands/cmd_pass.cpp index 801d9923b..801d9923b 100644 --- a/src/cmd_pass.cpp +++ b/src/commands/cmd_pass.cpp diff --git a/src/cmd_ping.cpp b/src/commands/cmd_ping.cpp index fb0b03829..fb0b03829 100644 --- a/src/cmd_ping.cpp +++ b/src/commands/cmd_ping.cpp diff --git a/src/cmd_pong.cpp b/src/commands/cmd_pong.cpp index e1927deab..e1927deab 100644 --- a/src/cmd_pong.cpp +++ b/src/commands/cmd_pong.cpp diff --git a/src/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp index 96aff8392..96aff8392 100644 --- a/src/cmd_privmsg.cpp +++ b/src/commands/cmd_privmsg.cpp diff --git a/src/cmd_qline.cpp b/src/commands/cmd_qline.cpp index 16927d234..16927d234 100644 --- a/src/cmd_qline.cpp +++ b/src/commands/cmd_qline.cpp diff --git a/src/cmd_quit.cpp b/src/commands/cmd_quit.cpp index c74f868ba..c74f868ba 100644 --- a/src/cmd_quit.cpp +++ b/src/commands/cmd_quit.cpp diff --git a/src/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index 2246c2f46..2246c2f46 100644 --- a/src/cmd_rehash.cpp +++ b/src/commands/cmd_rehash.cpp diff --git a/src/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp index 5180807b2..5180807b2 100644 --- a/src/cmd_reloadmodule.cpp +++ b/src/commands/cmd_reloadmodule.cpp diff --git a/src/cmd_restart.cpp b/src/commands/cmd_restart.cpp index 3f1ff13b8..3f1ff13b8 100644 --- a/src/cmd_restart.cpp +++ b/src/commands/cmd_restart.cpp diff --git a/src/cmd_rules.cpp b/src/commands/cmd_rules.cpp index f9009c9df..f9009c9df 100644 --- a/src/cmd_rules.cpp +++ b/src/commands/cmd_rules.cpp diff --git a/src/cmd_server.cpp b/src/commands/cmd_server.cpp index 9e80cc386..9e80cc386 100644 --- a/src/cmd_server.cpp +++ b/src/commands/cmd_server.cpp diff --git a/src/cmd_squit.cpp b/src/commands/cmd_squit.cpp index 8f1cbf43d..8f1cbf43d 100644 --- a/src/cmd_squit.cpp +++ b/src/commands/cmd_squit.cpp diff --git a/src/cmd_stats.cpp b/src/commands/cmd_stats.cpp index 52172df06..52172df06 100644 --- a/src/cmd_stats.cpp +++ b/src/commands/cmd_stats.cpp diff --git a/src/cmd_time.cpp b/src/commands/cmd_time.cpp index 97f4eb5ae..97f4eb5ae 100644 --- a/src/cmd_time.cpp +++ b/src/commands/cmd_time.cpp diff --git a/src/cmd_topic.cpp b/src/commands/cmd_topic.cpp index e12fd64f9..e12fd64f9 100644 --- a/src/cmd_topic.cpp +++ b/src/commands/cmd_topic.cpp diff --git a/src/cmd_trace.cpp b/src/commands/cmd_trace.cpp index d1e57ab00..d1e57ab00 100644 --- a/src/cmd_trace.cpp +++ b/src/commands/cmd_trace.cpp diff --git a/src/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp index fc20d4895..fc20d4895 100644 --- a/src/cmd_unloadmodule.cpp +++ b/src/commands/cmd_unloadmodule.cpp diff --git a/src/cmd_user.cpp b/src/commands/cmd_user.cpp index 0f64600e9..0f64600e9 100644 --- a/src/cmd_user.cpp +++ b/src/commands/cmd_user.cpp diff --git a/src/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp index 94f406c31..94f406c31 100644 --- a/src/cmd_userhost.cpp +++ b/src/commands/cmd_userhost.cpp diff --git a/src/cmd_version.cpp b/src/commands/cmd_version.cpp index 19bb9e4af..19bb9e4af 100644 --- a/src/cmd_version.cpp +++ b/src/commands/cmd_version.cpp diff --git a/src/cmd_wallops.cpp b/src/commands/cmd_wallops.cpp index f2a4ddfd9..f2a4ddfd9 100644 --- a/src/cmd_wallops.cpp +++ b/src/commands/cmd_wallops.cpp diff --git a/src/cmd_who.cpp b/src/commands/cmd_who.cpp index 70fe78da1..70fe78da1 100644 --- a/src/cmd_who.cpp +++ b/src/commands/cmd_who.cpp diff --git a/src/cmd_whois.cpp b/src/commands/cmd_whois.cpp index 45249a0f6..45249a0f6 100644 --- a/src/cmd_whois.cpp +++ b/src/commands/cmd_whois.cpp diff --git a/src/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp index 005a23489..005a23489 100644 --- a/src/cmd_whowas.cpp +++ b/src/commands/cmd_whowas.cpp diff --git a/src/cmd_zline.cpp b/src/commands/cmd_zline.cpp index d6394a7a3..d6394a7a3 100644 --- a/src/cmd_zline.cpp +++ b/src/commands/cmd_zline.cpp |