From 5d5285f24b1fe306faa2a6d0565ba1cff0f17f11 Mon Sep 17 00:00:00 2001
From: w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 22 Oct 2007 14:13:48 +0000
Subject: [PATCH] Move cmd_*.cpp to src/commands/. Not done in the nicest of
 ways yet, but ah well :p

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8299 e03df62e-2008-0410-955e-edbf42e46eb7
---
 .Makefile.inc                           | 108 ++++++++++++------------
 configure                               |  58 +++++++++----
 src/{ => commands}/cmd_admin.cpp        |   0
 src/{ => commands}/cmd_away.cpp         |   0
 src/{ => commands}/cmd_clearcache.cpp   |   0
 src/{ => commands}/cmd_commands.cpp     |   0
 src/{ => commands}/cmd_connect.cpp      |   0
 src/{ => commands}/cmd_die.cpp          |   0
 src/{ => commands}/cmd_eline.cpp        |   0
 src/{ => commands}/cmd_gline.cpp        |   0
 src/{ => commands}/cmd_info.cpp         |   0
 src/{ => commands}/cmd_invite.cpp       |   0
 src/{ => commands}/cmd_ison.cpp         |   0
 src/{ => commands}/cmd_join.cpp         |   0
 src/{ => commands}/cmd_kick.cpp         |   0
 src/{ => commands}/cmd_kill.cpp         |   0
 src/{ => commands}/cmd_kline.cpp        |   0
 src/{ => commands}/cmd_links.cpp        |   0
 src/{ => commands}/cmd_list.cpp         |   0
 src/{ => commands}/cmd_loadmodule.cpp   |   0
 src/{ => commands}/cmd_lusers.cpp       |   0
 src/{ => commands}/cmd_map.cpp          |   0
 src/{ => commands}/cmd_mode.cpp         |   0
 src/{ => commands}/cmd_modules.cpp      |   0
 src/{ => commands}/cmd_motd.cpp         |   0
 src/{ => commands}/cmd_names.cpp        |   0
 src/{ => commands}/cmd_nick.cpp         |   0
 src/{ => commands}/cmd_notice.cpp       |   0
 src/{ => commands}/cmd_oper.cpp         |   0
 src/{ => commands}/cmd_part.cpp         |   0
 src/{ => commands}/cmd_pass.cpp         |   0
 src/{ => commands}/cmd_ping.cpp         |   0
 src/{ => commands}/cmd_pong.cpp         |   0
 src/{ => commands}/cmd_privmsg.cpp      |   0
 src/{ => commands}/cmd_qline.cpp        |   0
 src/{ => commands}/cmd_quit.cpp         |   0
 src/{ => commands}/cmd_rehash.cpp       |   0
 src/{ => commands}/cmd_reloadmodule.cpp |   0
 src/{ => commands}/cmd_restart.cpp      |   0
 src/{ => commands}/cmd_rules.cpp        |   0
 src/{ => commands}/cmd_server.cpp       |   0
 src/{ => commands}/cmd_squit.cpp        |   0
 src/{ => commands}/cmd_stats.cpp        |   0
 src/{ => commands}/cmd_time.cpp         |   0
 src/{ => commands}/cmd_topic.cpp        |   0
 src/{ => commands}/cmd_trace.cpp        |   0
 src/{ => commands}/cmd_unloadmodule.cpp |   0
 src/{ => commands}/cmd_user.cpp         |   0
 src/{ => commands}/cmd_userhost.cpp     |   0
 src/{ => commands}/cmd_version.cpp      |   0
 src/{ => commands}/cmd_wallops.cpp      |   0
 src/{ => commands}/cmd_who.cpp          |   0
 src/{ => commands}/cmd_whois.cpp        |   0
 src/{ => commands}/cmd_whowas.cpp       |   0
 src/{ => commands}/cmd_zline.cpp        |   0
 55 files changed, 95 insertions(+), 71 deletions(-)
 rename src/{ => commands}/cmd_admin.cpp (100%)
 rename src/{ => commands}/cmd_away.cpp (100%)
 rename src/{ => commands}/cmd_clearcache.cpp (100%)
 rename src/{ => commands}/cmd_commands.cpp (100%)
 rename src/{ => commands}/cmd_connect.cpp (100%)
 rename src/{ => commands}/cmd_die.cpp (100%)
 rename src/{ => commands}/cmd_eline.cpp (100%)
 rename src/{ => commands}/cmd_gline.cpp (100%)
 rename src/{ => commands}/cmd_info.cpp (100%)
 rename src/{ => commands}/cmd_invite.cpp (100%)
 rename src/{ => commands}/cmd_ison.cpp (100%)
 rename src/{ => commands}/cmd_join.cpp (100%)
 rename src/{ => commands}/cmd_kick.cpp (100%)
 rename src/{ => commands}/cmd_kill.cpp (100%)
 rename src/{ => commands}/cmd_kline.cpp (100%)
 rename src/{ => commands}/cmd_links.cpp (100%)
 rename src/{ => commands}/cmd_list.cpp (100%)
 rename src/{ => commands}/cmd_loadmodule.cpp (100%)
 rename src/{ => commands}/cmd_lusers.cpp (100%)
 rename src/{ => commands}/cmd_map.cpp (100%)
 rename src/{ => commands}/cmd_mode.cpp (100%)
 rename src/{ => commands}/cmd_modules.cpp (100%)
 rename src/{ => commands}/cmd_motd.cpp (100%)
 rename src/{ => commands}/cmd_names.cpp (100%)
 rename src/{ => commands}/cmd_nick.cpp (100%)
 rename src/{ => commands}/cmd_notice.cpp (100%)
 rename src/{ => commands}/cmd_oper.cpp (100%)
 rename src/{ => commands}/cmd_part.cpp (100%)
 rename src/{ => commands}/cmd_pass.cpp (100%)
 rename src/{ => commands}/cmd_ping.cpp (100%)
 rename src/{ => commands}/cmd_pong.cpp (100%)
 rename src/{ => commands}/cmd_privmsg.cpp (100%)
 rename src/{ => commands}/cmd_qline.cpp (100%)
 rename src/{ => commands}/cmd_quit.cpp (100%)
 rename src/{ => commands}/cmd_rehash.cpp (100%)
 rename src/{ => commands}/cmd_reloadmodule.cpp (100%)
 rename src/{ => commands}/cmd_restart.cpp (100%)
 rename src/{ => commands}/cmd_rules.cpp (100%)
 rename src/{ => commands}/cmd_server.cpp (100%)
 rename src/{ => commands}/cmd_squit.cpp (100%)
 rename src/{ => commands}/cmd_stats.cpp (100%)
 rename src/{ => commands}/cmd_time.cpp (100%)
 rename src/{ => commands}/cmd_topic.cpp (100%)
 rename src/{ => commands}/cmd_trace.cpp (100%)
 rename src/{ => commands}/cmd_unloadmodule.cpp (100%)
 rename src/{ => commands}/cmd_user.cpp (100%)
 rename src/{ => commands}/cmd_userhost.cpp (100%)
 rename src/{ => commands}/cmd_version.cpp (100%)
 rename src/{ => commands}/cmd_wallops.cpp (100%)
 rename src/{ => commands}/cmd_who.cpp (100%)
 rename src/{ => commands}/cmd_whois.cpp (100%)
 rename src/{ => commands}/cmd_whowas.cpp (100%)
 rename src/{ => commands}/cmd_zline.cpp (100%)

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:
diff --git a/configure b/configure
index 0c5420150..12a3b9170 100755
--- a/configure
+++ b/configure
@@ -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
similarity index 100%
rename from src/cmd_admin.cpp
rename to src/commands/cmd_admin.cpp
diff --git a/src/cmd_away.cpp b/src/commands/cmd_away.cpp
similarity index 100%
rename from src/cmd_away.cpp
rename to src/commands/cmd_away.cpp
diff --git a/src/cmd_clearcache.cpp b/src/commands/cmd_clearcache.cpp
similarity index 100%
rename from src/cmd_clearcache.cpp
rename to src/commands/cmd_clearcache.cpp
diff --git a/src/cmd_commands.cpp b/src/commands/cmd_commands.cpp
similarity index 100%
rename from src/cmd_commands.cpp
rename to src/commands/cmd_commands.cpp
diff --git a/src/cmd_connect.cpp b/src/commands/cmd_connect.cpp
similarity index 100%
rename from src/cmd_connect.cpp
rename to src/commands/cmd_connect.cpp
diff --git a/src/cmd_die.cpp b/src/commands/cmd_die.cpp
similarity index 100%
rename from src/cmd_die.cpp
rename to src/commands/cmd_die.cpp
diff --git a/src/cmd_eline.cpp b/src/commands/cmd_eline.cpp
similarity index 100%
rename from src/cmd_eline.cpp
rename to src/commands/cmd_eline.cpp
diff --git a/src/cmd_gline.cpp b/src/commands/cmd_gline.cpp
similarity index 100%
rename from src/cmd_gline.cpp
rename to src/commands/cmd_gline.cpp
diff --git a/src/cmd_info.cpp b/src/commands/cmd_info.cpp
similarity index 100%
rename from src/cmd_info.cpp
rename to src/commands/cmd_info.cpp
diff --git a/src/cmd_invite.cpp b/src/commands/cmd_invite.cpp
similarity index 100%
rename from src/cmd_invite.cpp
rename to src/commands/cmd_invite.cpp
diff --git a/src/cmd_ison.cpp b/src/commands/cmd_ison.cpp
similarity index 100%
rename from src/cmd_ison.cpp
rename to src/commands/cmd_ison.cpp
diff --git a/src/cmd_join.cpp b/src/commands/cmd_join.cpp
similarity index 100%
rename from src/cmd_join.cpp
rename to src/commands/cmd_join.cpp
diff --git a/src/cmd_kick.cpp b/src/commands/cmd_kick.cpp
similarity index 100%
rename from src/cmd_kick.cpp
rename to src/commands/cmd_kick.cpp
diff --git a/src/cmd_kill.cpp b/src/commands/cmd_kill.cpp
similarity index 100%
rename from src/cmd_kill.cpp
rename to src/commands/cmd_kill.cpp
diff --git a/src/cmd_kline.cpp b/src/commands/cmd_kline.cpp
similarity index 100%
rename from src/cmd_kline.cpp
rename to src/commands/cmd_kline.cpp
diff --git a/src/cmd_links.cpp b/src/commands/cmd_links.cpp
similarity index 100%
rename from src/cmd_links.cpp
rename to src/commands/cmd_links.cpp
diff --git a/src/cmd_list.cpp b/src/commands/cmd_list.cpp
similarity index 100%
rename from src/cmd_list.cpp
rename to src/commands/cmd_list.cpp
diff --git a/src/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp
similarity index 100%
rename from src/cmd_loadmodule.cpp
rename to src/commands/cmd_loadmodule.cpp
diff --git a/src/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp
similarity index 100%
rename from src/cmd_lusers.cpp
rename to src/commands/cmd_lusers.cpp
diff --git a/src/cmd_map.cpp b/src/commands/cmd_map.cpp
similarity index 100%
rename from src/cmd_map.cpp
rename to src/commands/cmd_map.cpp
diff --git a/src/cmd_mode.cpp b/src/commands/cmd_mode.cpp
similarity index 100%
rename from src/cmd_mode.cpp
rename to src/commands/cmd_mode.cpp
diff --git a/src/cmd_modules.cpp b/src/commands/cmd_modules.cpp
similarity index 100%
rename from src/cmd_modules.cpp
rename to src/commands/cmd_modules.cpp
diff --git a/src/cmd_motd.cpp b/src/commands/cmd_motd.cpp
similarity index 100%
rename from src/cmd_motd.cpp
rename to src/commands/cmd_motd.cpp
diff --git a/src/cmd_names.cpp b/src/commands/cmd_names.cpp
similarity index 100%
rename from src/cmd_names.cpp
rename to src/commands/cmd_names.cpp
diff --git a/src/cmd_nick.cpp b/src/commands/cmd_nick.cpp
similarity index 100%
rename from src/cmd_nick.cpp
rename to src/commands/cmd_nick.cpp
diff --git a/src/cmd_notice.cpp b/src/commands/cmd_notice.cpp
similarity index 100%
rename from src/cmd_notice.cpp
rename to src/commands/cmd_notice.cpp
diff --git a/src/cmd_oper.cpp b/src/commands/cmd_oper.cpp
similarity index 100%
rename from src/cmd_oper.cpp
rename to src/commands/cmd_oper.cpp
diff --git a/src/cmd_part.cpp b/src/commands/cmd_part.cpp
similarity index 100%
rename from src/cmd_part.cpp
rename to src/commands/cmd_part.cpp
diff --git a/src/cmd_pass.cpp b/src/commands/cmd_pass.cpp
similarity index 100%
rename from src/cmd_pass.cpp
rename to src/commands/cmd_pass.cpp
diff --git a/src/cmd_ping.cpp b/src/commands/cmd_ping.cpp
similarity index 100%
rename from src/cmd_ping.cpp
rename to src/commands/cmd_ping.cpp
diff --git a/src/cmd_pong.cpp b/src/commands/cmd_pong.cpp
similarity index 100%
rename from src/cmd_pong.cpp
rename to src/commands/cmd_pong.cpp
diff --git a/src/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
similarity index 100%
rename from src/cmd_privmsg.cpp
rename to src/commands/cmd_privmsg.cpp
diff --git a/src/cmd_qline.cpp b/src/commands/cmd_qline.cpp
similarity index 100%
rename from src/cmd_qline.cpp
rename to src/commands/cmd_qline.cpp
diff --git a/src/cmd_quit.cpp b/src/commands/cmd_quit.cpp
similarity index 100%
rename from src/cmd_quit.cpp
rename to src/commands/cmd_quit.cpp
diff --git a/src/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
similarity index 100%
rename from src/cmd_rehash.cpp
rename to src/commands/cmd_rehash.cpp
diff --git a/src/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp
similarity index 100%
rename from src/cmd_reloadmodule.cpp
rename to src/commands/cmd_reloadmodule.cpp
diff --git a/src/cmd_restart.cpp b/src/commands/cmd_restart.cpp
similarity index 100%
rename from src/cmd_restart.cpp
rename to src/commands/cmd_restart.cpp
diff --git a/src/cmd_rules.cpp b/src/commands/cmd_rules.cpp
similarity index 100%
rename from src/cmd_rules.cpp
rename to src/commands/cmd_rules.cpp
diff --git a/src/cmd_server.cpp b/src/commands/cmd_server.cpp
similarity index 100%
rename from src/cmd_server.cpp
rename to src/commands/cmd_server.cpp
diff --git a/src/cmd_squit.cpp b/src/commands/cmd_squit.cpp
similarity index 100%
rename from src/cmd_squit.cpp
rename to src/commands/cmd_squit.cpp
diff --git a/src/cmd_stats.cpp b/src/commands/cmd_stats.cpp
similarity index 100%
rename from src/cmd_stats.cpp
rename to src/commands/cmd_stats.cpp
diff --git a/src/cmd_time.cpp b/src/commands/cmd_time.cpp
similarity index 100%
rename from src/cmd_time.cpp
rename to src/commands/cmd_time.cpp
diff --git a/src/cmd_topic.cpp b/src/commands/cmd_topic.cpp
similarity index 100%
rename from src/cmd_topic.cpp
rename to src/commands/cmd_topic.cpp
diff --git a/src/cmd_trace.cpp b/src/commands/cmd_trace.cpp
similarity index 100%
rename from src/cmd_trace.cpp
rename to src/commands/cmd_trace.cpp
diff --git a/src/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp
similarity index 100%
rename from src/cmd_unloadmodule.cpp
rename to src/commands/cmd_unloadmodule.cpp
diff --git a/src/cmd_user.cpp b/src/commands/cmd_user.cpp
similarity index 100%
rename from src/cmd_user.cpp
rename to src/commands/cmd_user.cpp
diff --git a/src/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
similarity index 100%
rename from src/cmd_userhost.cpp
rename to src/commands/cmd_userhost.cpp
diff --git a/src/cmd_version.cpp b/src/commands/cmd_version.cpp
similarity index 100%
rename from src/cmd_version.cpp
rename to src/commands/cmd_version.cpp
diff --git a/src/cmd_wallops.cpp b/src/commands/cmd_wallops.cpp
similarity index 100%
rename from src/cmd_wallops.cpp
rename to src/commands/cmd_wallops.cpp
diff --git a/src/cmd_who.cpp b/src/commands/cmd_who.cpp
similarity index 100%
rename from src/cmd_who.cpp
rename to src/commands/cmd_who.cpp
diff --git a/src/cmd_whois.cpp b/src/commands/cmd_whois.cpp
similarity index 100%
rename from src/cmd_whois.cpp
rename to src/commands/cmd_whois.cpp
diff --git a/src/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
similarity index 100%
rename from src/cmd_whowas.cpp
rename to src/commands/cmd_whowas.cpp
diff --git a/src/cmd_zline.cpp b/src/commands/cmd_zline.cpp
similarity index 100%
rename from src/cmd_zline.cpp
rename to src/commands/cmd_zline.cpp
-- 
2.39.5