From 8a990d2c87f8f8a6ca26dd2c6afef161dab2eb9e Mon Sep 17 00:00:00 2001 From: pk910 Date: Sat, 11 Feb 2012 22:56:23 +0100 Subject: [PATCH] added Makefile.am to each directory --- Makefile.am | 228 ++++++++++++---------- configure.ac | 7 +- src/modules/DummyServ.mod/bot_DummyServ.c | 44 ++--- src/modules/DummyServ.mod/bot_DummyServ.h | 2 +- src/modules/NeonHelp.mod/bot_NeonHelp.c | 27 +-- src/modules/NeonHelp.mod/bot_NeonHelp.h | 2 +- src/modules/NeonHelp.mod/cmd_neonhelp.c | 4 +- src/modules/NeonHelp.mod/cmd_neonhelp.h | 24 +-- src/modules/NeonServ.mod/bot_NeonServ.c | 36 ++-- src/modules/NeonServ.mod/bot_NeonServ.h | 2 +- src/modules/NeonServ.mod/cmd_neonserv.c | 4 +- src/modules/NeonServ.mod/cmd_neonserv.h | 44 ++--- src/modules/NeonSpam.mod/bot_NeonSpam.c | 39 ++-- src/modules/NeonSpam.mod/bot_NeonSpam.h | 2 +- src/modules/NeonSpam.mod/cmd_neonspam.c | 4 +- src/modules/NeonSpam.mod/cmd_neonspam.h | 43 ++-- src/modules/funcmd.mod/cmd_funcmds.c | 22 +-- src/modules/funcmd.mod/cmd_funcmds.h | 4 +- src/modules/global.mod/cmd_global.c | 8 +- src/modules/global.mod/cmd_global.h | 40 ++-- src/modules/module.h | 2 +- 21 files changed, 305 insertions(+), 283 deletions(-) diff --git a/Makefile.am b/Makefile.am index ee5d83f..5c9fc52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,129 @@ checkversion: cd src && chmod +x version.sh && ./version.sh && cd .. noinst_PROGRAMS = neonserv +noinst_LTLIBRARIES = libDummyServ.la libfuncmds.la libglobalcmd.la libNeonHelp.la libNeonServ.la libNeonSpam.la + +libDummyServ_la_SOURCES = src/modules/DummyServ.mod/bot_DummyServ.c \ + src/modules/DummyServ.mod/module.c + +libfuncmds_la_SOURCES = src/modules/funcmd.mod/cmd_funcmds.c \ + src/modules/funcmd.mod/module.c + +libglobalcmd_la_SOURCES = src/modules/global.mod/cmd_global.c \ + src/modules/global.mod/cmd_global_bind.c \ + src/modules/global.mod/cmd_global_command.c \ + src/modules/global.mod/cmd_global_commands.c \ + src/modules/global.mod/cmd_global_emote.c \ + src/modules/global.mod/cmd_global_god.c \ + src/modules/global.mod/cmd_global_netinfo.c \ + src/modules/global.mod/cmd_global_notice.c \ + src/modules/global.mod/cmd_global_raw.c \ + src/modules/global.mod/cmd_global_register.c \ + src/modules/global.mod/cmd_global_reloadlang.c \ + src/modules/global.mod/cmd_global_say.c \ + src/modules/global.mod/cmd_global_setaccess.c \ + src/modules/global.mod/cmd_global_unbind.c \ + src/modules/global.mod/cmd_global_unregister.c \ + src/modules/global.mod/cmd_global_version.c \ + src/modules/global.mod/cmd_global_staff.c \ + src/modules/global.mod/cmd_global_motd.c \ + src/modules/global.mod/cmd_global_bots.c \ + src/modules/global.mod/cmd_global_reload.c \ + src/modules/global.mod/cmd_global_restart.c \ + src/modules/global.mod/cmd_global_die.c \ + src/modules/global.mod/cmd_global_setbot.c \ + src/modules/global.mod/cmd_global_addbot.c \ + src/modules/global.mod/cmd_global_delbot.c \ + src/modules/global.mod/cmd_global_reconnect.c \ + src/modules/global.mod/cmd_global_modcmd.c \ + src/modules/global.mod/cmd_global_meminfo.c \ + src/modules/global.mod/module.c + +libNeonHelp_la_SOURCES = src/modules/NeonHelp.mod/bot_NeonHelp.c \ + src/modules/NeonHelp.mod/cmd_neonhelp.c \ + src/modules/NeonHelp.mod/cmd_neonhelp_next.c \ + src/modules/NeonHelp.mod/cmd_neonhelp_delete.c \ + src/modules/NeonHelp.mod/cmd_neonhelp_requests.c \ + src/modules/NeonHelp.mod/cmd_neonhelp_stats.c \ + src/modules/NeonHelp.mod/module.c + +libNeonServ_la_SOURCES = src/modules/NeonServ.mod/bot_NeonServ.c \ + src/modules/NeonServ.mod/cmd_neonserv.c \ + src/modules/NeonServ.mod/cmd_neonserv_access.c \ + src/modules/NeonServ.mod/cmd_neonserv_addban.c \ + src/modules/NeonServ.mod/cmd_neonserv_addtimeban.c \ + src/modules/NeonServ.mod/cmd_neonserv_adduser.c \ + src/modules/NeonServ.mod/cmd_neonserv_ban.c \ + src/modules/NeonServ.mod/cmd_neonserv_bans.c \ + src/modules/NeonServ.mod/cmd_neonserv_chanservsync.c \ + src/modules/NeonServ.mod/cmd_neonserv_clvl.c \ + src/modules/NeonServ.mod/cmd_neonserv_csuspend.c \ + src/modules/NeonServ.mod/cmd_neonserv_cunsuspend.c \ + src/modules/NeonServ.mod/cmd_neonserv_delban.c \ + src/modules/NeonServ.mod/cmd_neonserv_delme.c \ + src/modules/NeonServ.mod/cmd_neonserv_deluser.c \ + src/modules/NeonServ.mod/cmd_neonserv_deop.c \ + src/modules/NeonServ.mod/cmd_neonserv_deopall.c \ + src/modules/NeonServ.mod/cmd_neonserv_devoice.c \ + src/modules/NeonServ.mod/cmd_neonserv_devoiceall.c \ + src/modules/NeonServ.mod/cmd_neonserv_down.c \ + src/modules/NeonServ.mod/cmd_neonserv_downall.c \ + src/modules/NeonServ.mod/cmd_neonserv_events.c \ + src/modules/NeonServ.mod/cmd_neonserv_giveowner.c \ + src/modules/NeonServ.mod/cmd_neonserv_help.c \ + src/modules/NeonServ.mod/cmd_neonserv_invite.c \ + src/modules/NeonServ.mod/cmd_neonserv_inviteme.c \ + src/modules/NeonServ.mod/cmd_neonserv_kick.c \ + src/modules/NeonServ.mod/cmd_neonserv_kickban.c \ + src/modules/NeonServ.mod/cmd_neonserv_mdeluser.c \ + src/modules/NeonServ.mod/cmd_neonserv_mode.c \ + src/modules/NeonServ.mod/cmd_neonserv_move.c \ + src/modules/NeonServ.mod/cmd_neonserv_myaccess.c \ + src/modules/NeonServ.mod/cmd_neonserv_op.c \ + src/modules/NeonServ.mod/cmd_neonserv_opall.c \ + src/modules/NeonServ.mod/cmd_neonserv_oplog.c \ + src/modules/NeonServ.mod/cmd_neonserv_peek.c \ + src/modules/NeonServ.mod/cmd_neonserv_recover.c \ + src/modules/NeonServ.mod/cmd_neonserv_resync.c \ + src/modules/NeonServ.mod/cmd_neonserv_search.c \ + src/modules/NeonServ.mod/cmd_neonserv_set.c \ + src/modules/NeonServ.mod/cmd_neonserv_suspend.c \ + src/modules/NeonServ.mod/cmd_neonserv_topic.c \ + src/modules/NeonServ.mod/cmd_neonserv_trace.c \ + src/modules/NeonServ.mod/cmd_neonserv_trim.c \ + src/modules/NeonServ.mod/cmd_neonserv_unban.c \ + src/modules/NeonServ.mod/cmd_neonserv_unbanall.c \ + src/modules/NeonServ.mod/cmd_neonserv_unbanme.c \ + src/modules/NeonServ.mod/cmd_neonserv_unsuspend.c \ + src/modules/NeonServ.mod/cmd_neonserv_up.c \ + src/modules/NeonServ.mod/cmd_neonserv_upall.c \ + src/modules/NeonServ.mod/cmd_neonserv_users.c \ + src/modules/NeonServ.mod/cmd_neonserv_uset.c \ + src/modules/NeonServ.mod/cmd_neonserv_voice.c \ + src/modules/NeonServ.mod/cmd_neonserv_voiceall.c \ + src/modules/NeonServ.mod/cmd_neonserv_wipeinfo.c \ + src/modules/NeonServ.mod/cmd_neonserv_addrank.c \ + src/modules/NeonServ.mod/cmd_neonserv_assignrank.c \ + src/modules/NeonServ.mod/cmd_neonserv_delrank.c \ + src/modules/NeonServ.mod/cmd_neonserv_listrank.c \ + src/modules/NeonServ.mod/cmd_neonserv_setrank.c \ + src/modules/NeonServ.mod/cmd_neonserv_info.c \ + src/modules/NeonServ.mod/cmd_neonserv_rename.c \ + src/modules/NeonServ.mod/cmd_neonserv_unvisited.c \ + src/modules/NeonServ.mod/cmd_neonserv_extscript.c \ + src/modules/NeonServ.mod/cmd_neonserv_noregister.c \ + src/modules/NeonServ.mod/cmd_neonserv_nicklist.c \ + src/modules/NeonServ.mod/cmd_neonserv_halfop.c \ + src/modules/NeonServ.mod/cmd_neonserv_dehalfop.c \ + src/modules/NeonServ.mod/cmd_neonserv_halfopall.c \ + src/modules/NeonServ.mod/cmd_neonserv_dehalfopall.c \ + src/modules/NeonServ.mod/module.c + +libNeonSpam_la_SOURCES = src/modules/NeonSpam.mod/bot_NeonSpam.c \ + src/modules/NeonSpam.mod/cmd_neonspam.c \ + src/modules/NeonSpam.mod/cmd_neonspam_set.c \ + src/modules/NeonSpam.mod/module.c + neonserv_SOURCES = src/version.c \ src/EventLogger.c \ src/IRCEvents.c \ @@ -32,111 +155,6 @@ neonserv_SOURCES = src/version.c \ src/IRCQueue.c \ src/commands.c \ src/bots.c \ - src/bot_NeonServ.c \ - src/bot_NeonSpam.c \ - src/bot_DummyServ.c \ - src/bot_NeonHelp.c \ - src/cmd_neonserv_access.c \ - src/cmd_neonserv_addban.c \ - src/cmd_neonserv_addtimeban.c \ - src/cmd_neonserv_adduser.c \ - src/cmd_neonserv_ban.c \ - src/cmd_neonserv_bans.c \ - src/cmd_global_bind.c \ - src/cmd_neonserv_chanservsync.c \ - src/cmd_neonserv_clvl.c \ - src/cmd_global_command.c \ - src/cmd_global_commands.c \ - src/cmd_neonserv_csuspend.c \ - src/cmd_neonserv_cunsuspend.c \ - src/cmd_neonserv_delban.c \ - src/cmd_neonserv_delme.c \ - src/cmd_neonserv_deluser.c \ - src/cmd_neonserv_deop.c \ - src/cmd_neonserv_deopall.c \ - src/cmd_neonserv_devoice.c \ - src/cmd_neonserv_devoiceall.c \ - src/cmd_neonserv_down.c \ - src/cmd_neonserv_downall.c \ - src/cmd_global_emote.c \ - src/cmd_neonserv_events.c \ - src/cmd_neonserv_giveowner.c \ - src/cmd_global_god.c \ - src/cmd_neonserv_help.c \ - src/cmd_neonserv_invite.c \ - src/cmd_neonserv_inviteme.c \ - src/cmd_neonserv_kick.c \ - src/cmd_neonserv_kickban.c \ - src/cmd_neonserv_mdeluser.c \ - src/cmd_neonserv_mode.c \ - src/cmd_neonserv_move.c \ - src/cmd_neonserv_myaccess.c \ - src/cmd_global_netinfo.c \ - src/cmd_global_notice.c \ - src/cmd_neonserv_op.c \ - src/cmd_neonserv_opall.c \ - src/cmd_neonserv_oplog.c \ - src/cmd_neonserv_peek.c \ - src/cmd_global_raw.c \ - src/cmd_neonserv_recover.c \ - src/cmd_global_register.c \ - src/cmd_global_reloadlang.c \ - src/cmd_neonserv_resync.c \ - src/cmd_global_say.c \ - src/cmd_neonserv_search.c \ - src/cmd_neonserv_set.c \ - src/cmd_global_setaccess.c \ - src/cmd_neonserv_suspend.c \ - src/cmd_neonserv_topic.c \ - src/cmd_neonserv_trace.c \ - src/cmd_neonserv_trim.c \ - src/cmd_neonserv_unban.c \ - src/cmd_neonserv_unbanall.c \ - src/cmd_neonserv_unbanme.c \ - src/cmd_global_unbind.c \ - src/cmd_global_unregister.c \ - src/cmd_neonserv_unsuspend.c \ - src/cmd_neonserv_up.c \ - src/cmd_neonserv_upall.c \ - src/cmd_neonserv_users.c \ - src/cmd_neonserv_uset.c \ - src/cmd_global_version.c \ - src/cmd_neonserv_voice.c \ - src/cmd_neonserv_voiceall.c \ - src/cmd_neonserv_wipeinfo.c \ - src/cmd_neonserv_addrank.c \ - src/cmd_neonserv_assignrank.c \ - src/cmd_neonserv_delrank.c \ - src/cmd_neonserv_listrank.c \ - src/cmd_neonserv_setrank.c \ - src/cmd_neonserv_info.c \ - src/cmd_neonserv_rename.c \ - src/cmd_neonserv_unvisited.c \ - src/cmd_neonserv_extscript.c \ - src/cmd_neonspam_set.c \ - src/cmd_neonserv_noregister.c \ - src/cmd_global_staff.c \ - src/cmd_global_motd.c \ - src/cmd_global_bots.c \ - src/cmd_global_reload.c \ - src/cmd_global_restart.c \ - src/cmd_global_die.c \ - src/cmd_neonserv_nicklist.c \ - src/cmd_global_setbot.c \ - src/cmd_global_addbot.c \ - src/cmd_global_delbot.c \ - src/cmd_global_reconnect.c \ - src/cmd_global_modcmd.c \ - src/cmd_neonhelp_next.c \ - src/cmd_neonhelp_delete.c \ - src/cmd_neonhelp_requests.c \ - src/cmd_neonserv_halfop.c \ - src/cmd_neonserv_dehalfop.c \ - src/cmd_neonserv_halfopall.c \ - src/cmd_neonserv_dehalfopall.c \ - src/cmd_neonhelp_stats.c \ - src/cmd_global_meminfo.c \ - src/cmd_funcmds.c \ src/ConfigParser.c \ src/QServer.c \ src/memoryDebug.c diff --git a/configure.ac b/configure.ac index eb160e5..e75bc48 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,12 @@ AC_PREREQ([2.67]) AC_INIT([NeonServ], [5.3], [bugs@pk910.de], [neonserv], [http://neonserv.krypton-bouncer.de]) AC_PREFIX_DEFAULT([~/neonserv]) +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_HEADERS([config.h]) +LT_INIT([disable-static]) + # Checks for programs. AC_PROG_CC AC_PROG_AWK @@ -85,5 +88,7 @@ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket. AC_FUNC_MALLOC AC_CHECK_FUNCS([gethostbyname memset select socket strchr strdup strstr]) -AC_CONFIG_FILES([Makefile]) +MY_SUBDIRS="src" +AC_SUBST(MY_SUBDIRS) +AC_CONFIG_FILES(Makefile src/Makefile src/modules/Makefile) AC_OUTPUT \ No newline at end of file diff --git a/src/modules/DummyServ.mod/bot_DummyServ.c b/src/modules/DummyServ.mod/bot_DummyServ.c index 9d9d720..51d8bfb 100644 --- a/src/modules/DummyServ.mod/bot_DummyServ.c +++ b/src/modules/DummyServ.mod/bot_DummyServ.c @@ -17,27 +17,25 @@ #include "../module.h" #include "bot_DummyServ.h" -#include "modcmd.h" -#include "IRCParser.h" -#include "IRCEvents.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "ModeNode.h" -#include "BanNode.h" -#include "ClientSocket.h" -#include "mysqlConn.h" -#include "lang.h" -#include "HandleInfoHandler.h" -#include "WHOHandler.h" -#include "DBHelper.h" -#include "tools.h" -#include "timeq.h" -#include "version.h" -#include "EventLogger.h" -#include "bots.h" -#include "cmd_neonserv.h" -#include "cmd_neonspam.h" +#include "../../modcmd.h" +#include "../../IRCParser.h" +#include "../../IRCEvents.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../ModeNode.h" +#include "../../BanNode.h" +#include "../../ClientSocket.h" +#include "../../mysqlConn.h" +#include "../../lang.h" +#include "../../HandleInfoHandler.h" +#include "../../WHOHandler.h" +#include "../../DBHelper.h" +#include "../../tools.h" +#include "../../timeq.h" +#include "../../version.h" +#include "../../EventLogger.h" +#include "../../bots.h" #define BOTID 3 #define BOTALIAS "DummyServ" @@ -113,9 +111,9 @@ void init_DummyServ(int type) { if(type == MODSTATE_REBIND) return; //register events - bind_bot_ready(dummyserv_bot_ready); + bind_bot_ready(dummyserv_bot_ready, module_id); - set_trigger_callback(BOTID, dummyserv_trigger_callback); + set_trigger_callback(BOTID, module_id, dummyserv_trigger_callback); } void loop_DummyServ() { diff --git a/src/modules/DummyServ.mod/bot_DummyServ.h b/src/modules/DummyServ.mod/bot_DummyServ.h index 7483fec..fe21100 100644 --- a/src/modules/DummyServ.mod/bot_DummyServ.h +++ b/src/modules/DummyServ.mod/bot_DummyServ.h @@ -17,7 +17,7 @@ #ifndef _bot_DummyServ_h #define _bot_DummyServ_h -#include "main.h" +#include "../../main.h" void init_DummyServ(int type); void loop_DummyServ(); diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c index f3df2fc..8b00188 100644 --- a/src/modules/NeonHelp.mod/bot_NeonHelp.c +++ b/src/modules/NeonHelp.mod/bot_NeonHelp.c @@ -14,21 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#include "../module.h" #include "bot_NeonHelp.h" -#include "modcmd.h" -#include "cmd_neonhelp.h" -#include "lang.h" -#include "mysqlConn.h" -#include "ClientSocket.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "IRCEvents.h" -#include "IRCParser.h" -#include "bots.h" -#include "DBHelper.h" -#include "WHOHandler.h" +#include "../../modcmd.h" +#include "../../cmd_neonhelp.h" +#include "../../lang.h" +#include "../../mysqlConn.h" +#include "../../ClientSocket.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../IRCEvents.h" +#include "../../IRCParser.h" +#include "../../bots.h" +#include "../../DBHelper.h" +#include "../../WHOHandler.h" #define BOTID 4 #define BOTALIAS "NeonHelp" diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.h b/src/modules/NeonHelp.mod/bot_NeonHelp.h index eaf47ff..cd584d0 100644 --- a/src/modules/NeonHelp.mod/bot_NeonHelp.h +++ b/src/modules/NeonHelp.mod/bot_NeonHelp.h @@ -17,7 +17,7 @@ #ifndef _bot_NeonHelp_h #define _bot_NeonHelp_h -#include "main.h" +#include "../../main.h" /* definition for ClientSocket struct */ #define botclass_helpnode botclassvalue1 diff --git a/src/modules/NeonHelp.mod/cmd_neonhelp.c b/src/modules/NeonHelp.mod/cmd_neonhelp.c index 252d112..fc71850 100644 --- a/src/modules/NeonHelp.mod/cmd_neonhelp.c +++ b/src/modules/NeonHelp.mod/cmd_neonhelp.c @@ -16,8 +16,8 @@ */ #include "../module.h" #include "cmd_neonhelp.h" -#include "modcmd.h" -#include "ConfigParser.h" +#include "../../modcmd.h" +#include "../../ConfigParser.h" void register_commands() { //NeonHelp Commands diff --git a/src/modules/NeonHelp.mod/cmd_neonhelp.h b/src/modules/NeonHelp.mod/cmd_neonhelp.h index 9a74fbf..c9b9152 100644 --- a/src/modules/NeonHelp.mod/cmd_neonhelp.h +++ b/src/modules/NeonHelp.mod/cmd_neonhelp.h @@ -17,18 +17,18 @@ #ifndef _cmd_neonhelp_h #define _cmd_neonhelp_h #include "../module.h" -#include "main.h" -#include "modcmd.h" -#include "mysqlConn.h" -#include "ClientSocket.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "DBHelper.h" -#include "IRCParser.h" -#include "bot_NeonHelp.h" -#include "lang.h" -#include "tools.h" +#include "../../main.h" +#include "../../modcmd.h" +#include "../../mysqlConn.h" +#include "../../ClientSocket.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../DBHelper.h" +#include "../../IRCParser.h" +#include "../../bot_NeonHelp.h" +#include "../../lang.h" +#include "../../tools.h" void register_commands(); diff --git a/src/modules/NeonServ.mod/bot_NeonServ.c b/src/modules/NeonServ.mod/bot_NeonServ.c index e6ec912..f937bcf 100644 --- a/src/modules/NeonServ.mod/bot_NeonServ.c +++ b/src/modules/NeonServ.mod/bot_NeonServ.c @@ -17,25 +17,25 @@ #include "../module.h" #include "bot_NeonServ.h" -#include "modcmd.h" -#include "IRCEvents.h" -#include "IRCParser.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "BanNode.h" -#include "ModeNode.h" -#include "ClientSocket.h" -#include "mysqlConn.h" -#include "lang.h" -#include "HandleInfoHandler.h" -#include "WHOHandler.h" -#include "DBHelper.h" -#include "tools.h" -#include "timeq.h" -#include "EventLogger.h" +#include "../../modcmd.h" +#include "../../IRCEvents.h" +#include "../../IRCParser.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../BanNode.h" +#include "../../ModeNode.h" +#include "../../ClientSocket.h" +#include "../../mysqlConn.h" +#include "../../lang.h" +#include "../../HandleInfoHandler.h" +#include "../../WHOHandler.h" +#include "../../DBHelper.h" +#include "../../tools.h" +#include "../../timeq.h" +#include "../../EventLogger.h" #include "cmd_neonserv.h" -#include "ConfigParser.h" +#include "../../ConfigParser.h" #define BOTID 1 #define BOTALIAS "NeonServ" diff --git a/src/modules/NeonServ.mod/bot_NeonServ.h b/src/modules/NeonServ.mod/bot_NeonServ.h index 883275c..7817053 100644 --- a/src/modules/NeonServ.mod/bot_NeonServ.h +++ b/src/modules/NeonServ.mod/bot_NeonServ.h @@ -17,7 +17,7 @@ #ifndef _bot_NeonServ_h #define _bot_NeonServ_h -#include "main.h" +#include "../../main.h" struct ChanNode; diff --git a/src/modules/NeonServ.mod/cmd_neonserv.c b/src/modules/NeonServ.mod/cmd_neonserv.c index 5c24826..8630e44 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv.c +++ b/src/modules/NeonServ.mod/cmd_neonserv.c @@ -16,8 +16,8 @@ */ #include "../module.h" #include "cmd_neonserv.h" -#include "modcmd.h" -#include "ConfigParser.h" +#include "../../modcmd.h" +#include "../../ConfigParser.h" void register_commands() { //NeonServ Commands diff --git a/src/modules/NeonServ.mod/cmd_neonserv.h b/src/modules/NeonServ.mod/cmd_neonserv.h index 9c31b16..bef9dd9 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv.h +++ b/src/modules/NeonServ.mod/cmd_neonserv.h @@ -17,28 +17,28 @@ #ifndef _cmd_neonserv_h #define _cmd_neonserv_h #include "../module.h" -#include "main.h" -#include "modcmd.h" -#include "IRCParser.h" -#include "IRCEvents.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "ModeNode.h" -#include "BanNode.h" -#include "ClientSocket.h" -#include "mysqlConn.h" -#include "lang.h" -#include "HandleInfoHandler.h" -#include "WHOHandler.h" -#include "DBHelper.h" -#include "tools.h" -#include "timeq.h" -#include "version.h" -#include "EventLogger.h" -#include "bots.h" -#include "bot_NeonServ.h" -#include "ConfigParser.h" +#include "../../main.h" +#include "../../modcmd.h" +#include "../../IRCParser.h" +#include "../../IRCEvents.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../ModeNode.h" +#include "../../BanNode.h" +#include "../../ClientSocket.h" +#include "../../mysqlConn.h" +#include "../../lang.h" +#include "../../HandleInfoHandler.h" +#include "../../WHOHandler.h" +#include "../../DBHelper.h" +#include "../../tools.h" +#include "../../timeq.h" +#include "../../version.h" +#include "../../EventLogger.h" +#include "../../bots.h" +#include "../../bot_NeonServ.h" +#include "../../ConfigParser.h" void register_commands(); diff --git a/src/modules/NeonSpam.mod/bot_NeonSpam.c b/src/modules/NeonSpam.mod/bot_NeonSpam.c index 5784f63..8438381 100644 --- a/src/modules/NeonSpam.mod/bot_NeonSpam.c +++ b/src/modules/NeonSpam.mod/bot_NeonSpam.c @@ -17,26 +17,25 @@ #include "../module.h" #include "bot_NeonSpam.h" -#include "modcmd.h" -#include "IRCParser.h" -#include "IRCEvents.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "ModeNode.h" -#include "BanNode.h" -#include "ClientSocket.h" -#include "mysqlConn.h" -#include "lang.h" -#include "HandleInfoHandler.h" -#include "WHOHandler.h" -#include "DBHelper.h" -#include "tools.h" -#include "timeq.h" -#include "version.h" -#include "EventLogger.h" -#include "bots.h" -#include "cmd_neonserv.h" +#include "../../modcmd.h" +#include "../../IRCParser.h" +#include "../../IRCEvents.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../ModeNode.h" +#include "../../BanNode.h" +#include "../../ClientSocket.h" +#include "../../mysqlConn.h" +#include "../../lang.h" +#include "../../HandleInfoHandler.h" +#include "../../WHOHandler.h" +#include "../../DBHelper.h" +#include "../../tools.h" +#include "../../timeq.h" +#include "../../version.h" +#include "../../EventLogger.h" +#include "../../bots.h" #include "cmd_neonspam.h" #define BOTID 2 diff --git a/src/modules/NeonSpam.mod/bot_NeonSpam.h b/src/modules/NeonSpam.mod/bot_NeonSpam.h index 34a24b5..ea227e0 100644 --- a/src/modules/NeonSpam.mod/bot_NeonSpam.h +++ b/src/modules/NeonSpam.mod/bot_NeonSpam.h @@ -18,7 +18,7 @@ #ifndef _bot_NeonSpam_h #define _bot_NeonSpam_h -#include "main.h" +#include "../../main.h" struct ChanNode; diff --git a/src/modules/NeonSpam.mod/cmd_neonspam.c b/src/modules/NeonSpam.mod/cmd_neonspam.c index f013299..073512b 100644 --- a/src/modules/NeonSpam.mod/cmd_neonspam.c +++ b/src/modules/NeonSpam.mod/cmd_neonspam.c @@ -17,8 +17,8 @@ #include "../module.h" #include "cmd_neonspam.h" -#include "modcmd.h" -#include "ConfigParser.h" +#include "../../modcmd.h" +#include "../../ConfigParser.h" void register_commands() { //NeonSpam Commands diff --git a/src/modules/NeonSpam.mod/cmd_neonspam.h b/src/modules/NeonSpam.mod/cmd_neonspam.h index 9989192..383eeaf 100644 --- a/src/modules/NeonSpam.mod/cmd_neonspam.h +++ b/src/modules/NeonSpam.mod/cmd_neonspam.h @@ -16,27 +16,28 @@ */ #ifndef _cmd_neonspam_h #define _cmd_neonspam_h -#include "main.h" -#include "modcmd.h" -#include "IRCParser.h" -#include "IRCEvents.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "ModeNode.h" -#include "BanNode.h" -#include "ClientSocket.h" -#include "mysqlConn.h" -#include "lang.h" -#include "HandleInfoHandler.h" -#include "WHOHandler.h" -#include "DBHelper.h" -#include "tools.h" -#include "timeq.h" -#include "version.h" -#include "EventLogger.h" -#include "bots.h" -#include "bot_NeonSpam.h" +#include "../module.h" +#include "../../main.h" +#include "../../modcmd.h" +#include "../../IRCParser.h" +#include "../../IRCEvents.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../ModeNode.h" +#include "../../BanNode.h" +#include "../../ClientSocket.h" +#include "../../mysqlConn.h" +#include "../../lang.h" +#include "../../HandleInfoHandler.h" +#include "../../WHOHandler.h" +#include "../../DBHelper.h" +#include "../../tools.h" +#include "../../timeq.h" +#include "../../version.h" +#include "../../EventLogger.h" +#include "../../bots.h" +#include "../../bot_NeonSpam.h" CMD_BIND(neonspam_cmd_set); diff --git a/src/modules/funcmd.mod/cmd_funcmds.c b/src/modules/funcmd.mod/cmd_funcmds.c index dc3cb8b..3849248 100644 --- a/src/modules/funcmd.mod/cmd_funcmds.c +++ b/src/modules/funcmd.mod/cmd_funcmds.c @@ -16,15 +16,15 @@ */ #include "../module.h" #include "cmd_funcmds.h" -#include "modcmd.h" -#include "mysqlConn.h" -#include "IRCParser.h" -#include "ClientSocket.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "lang.h" -#include "tools.h" -#include "DBHelper.h" +#include "../../modcmd.h" +#include "../../mysqlConn.h" +#include "../../IRCParser.h" +#include "../../ClientSocket.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../lang.h" +#include "../../tools.h" +#include "../../DBHelper.h" static const struct default_language_entry msgtab[] = { {"FUN_DICE", "$b%s$b: A $b%d$b shows on the %d-sided die."}, /* {ARGS: "TestUser", 5, 6} */ @@ -43,9 +43,9 @@ void init_funcmds() { void register_commands() { //Fun Commands register_command_alias(3, "FunCMD"); - #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,FLAGS) register_command(3, NAME, FUNCTION, PARAMCOUNT, NULL, 0, FLAGS) + #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,FLAGS) register_command(3, NAME, module_id, FUNCTION, PARAMCOUNT, NULL, 0, FLAGS) // NAME FUNCTION PARAMS FLAGS - USER_COMMAND("extscript", neonserv_cmd_extscript, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_EMPTY_ARGS | CMDFLAG_CHAN_PARAM | CMDFLAG_FUNCMD); + //USER_COMMAND("extscript", neonserv_cmd_extscript, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_EMPTY_ARGS | CMDFLAG_CHAN_PARAM | CMDFLAG_FUNCMD); USER_COMMAND("ping", funcmd_ping, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD); USER_COMMAND("pong", funcmd_pong, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD); USER_COMMAND("dice", funcmd_dice, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD); diff --git a/src/modules/funcmd.mod/cmd_funcmds.h b/src/modules/funcmd.mod/cmd_funcmds.h index 70125dd..b91747e 100644 --- a/src/modules/funcmd.mod/cmd_funcmds.h +++ b/src/modules/funcmd.mod/cmd_funcmds.h @@ -17,8 +17,8 @@ #ifndef _cmd_funcmds_h #define _cmd_funcmds_h #include "../module.h" -#include "main.h" -#include "modcmd.h" +#include "../../main.h" +#include "../../modcmd.h" void init_funcmds(); void register_commands(); diff --git a/src/modules/global.mod/cmd_global.c b/src/modules/global.mod/cmd_global.c index 9741e6c..7f835fd 100644 --- a/src/modules/global.mod/cmd_global.c +++ b/src/modules/global.mod/cmd_global.c @@ -16,13 +16,13 @@ */ #include "../module.h" #include "cmd_global.h" -#include "modcmd.h" -#include "ConfigParser.h" +#include "../../modcmd.h" +#include "../../ConfigParser.h" void register_commands() { //Global Commands - #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,PRIVS,FLAGS) register_command(0, NAME, FUNCTION, PARAMCOUNT, PRIVS, 0, FLAGS) + #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,PRIVS,FLAGS) register_command(0, NAME, module_id, FUNCTION, PARAMCOUNT, PRIVS, 0, FLAGS) // NAME FUNCTION PARAMS PRIVS FLAGS USER_COMMAND("version", global_cmd_version, 0, NULL, 0); USER_COMMAND("netinfo", global_cmd_netinfo, 0, NULL, 0); @@ -32,7 +32,7 @@ void register_commands() { USER_COMMAND("motd", global_cmd_motd, 0, NULL, 0); #undef USER_COMMAND - #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(0, NAME, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS) + #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(0, NAME, module_id, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS) // NAME FUNCTION PARAMS ACCS FLAGS OPER_COMMAND("register", global_cmd_register, 1, 200, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); OPER_COMMAND("unregister", global_cmd_unregister,0, 200, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); diff --git a/src/modules/global.mod/cmd_global.h b/src/modules/global.mod/cmd_global.h index 5b3f553..70aa47e 100644 --- a/src/modules/global.mod/cmd_global.h +++ b/src/modules/global.mod/cmd_global.h @@ -17,26 +17,26 @@ #ifndef _cmd_global_h #define _cmd_global_h #include "../module.h" -#include "main.h" -#include "modcmd.h" -#include "IRCParser.h" -#include "IRCEvents.h" -#include "UserNode.h" -#include "ChanNode.h" -#include "ChanUser.h" -#include "ModeNode.h" -#include "BanNode.h" -#include "ClientSocket.h" -#include "mysqlConn.h" -#include "lang.h" -#include "HandleInfoHandler.h" -#include "WHOHandler.h" -#include "DBHelper.h" -#include "tools.h" -#include "timeq.h" -#include "version.h" -#include "EventLogger.h" -#include "bots.h" +#include "../../main.h" +#include "../../modcmd.h" +#include "../../IRCParser.h" +#include "../../IRCEvents.h" +#include "../../UserNode.h" +#include "../../ChanNode.h" +#include "../../ChanUser.h" +#include "../../ModeNode.h" +#include "../../BanNode.h" +#include "../../ClientSocket.h" +#include "../../mysqlConn.h" +#include "../../lang.h" +#include "../../HandleInfoHandler.h" +#include "../../WHOHandler.h" +#include "../../DBHelper.h" +#include "../../tools.h" +#include "../../timeq.h" +#include "../../version.h" +#include "../../EventLogger.h" +#include "../../bots.h" void register_commands(); diff --git a/src/modules/module.h b/src/modules/module.h index 6fc0a8c..7e7575c 100644 --- a/src/modules/module.h +++ b/src/modules/module.h @@ -223,7 +223,7 @@ extern int module_id; int init_module(void **functions, int modid) { \ global = functions; \ module_id = modid; \ - return initfunc(data); \ + return initfunc(); \ } \ void start_module(int type) { \ startfunc(type); \ -- 2.20.1