From 4a2b9ebcf38d6c0a2860b966421b3af125438488 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 25 May 2010 00:57:25 -0500 Subject: [PATCH] Renamed all of source files from .c to .cpp --- configure | 2 +- configure.in | 2 +- src/CMakeLists.txt | 3 +- src/Makefile | 57 +++++++++---------- src/{actions.c => actions.cpp} | 0 src/{base64.c => base64.cpp} | 0 src/{botserv.c => botserv.cpp} | 0 src/{channels.c => channels.cpp} | 0 src/{chanserv.c => chanserv.cpp} | 0 src/{commands.c => commands.cpp} | 0 src/{compat.c => compat.cpp} | 0 src/{config.c => config.cpp} | 0 src/core/CMakeLists.txt | 3 +- src/core/Makefile | 8 +-- src/core/{bs_act.c => bs_act.cpp} | 0 src/core/{bs_assign.c => bs_assign.cpp} | 0 src/core/{bs_badwords.c => bs_badwords.cpp} | 0 src/core/{bs_bot.c => bs_bot.cpp} | 0 src/core/{bs_botlist.c => bs_botlist.cpp} | 0 src/core/{bs_help.c => bs_help.cpp} | 0 src/core/{bs_info.c => bs_info.cpp} | 0 src/core/{bs_kick.c => bs_kick.cpp} | 0 src/core/{bs_say.c => bs_say.cpp} | 0 src/core/{bs_set.c => bs_set.cpp} | 0 src/core/{bs_unassign.c => bs_unassign.cpp} | 0 src/core/{cs_access.c => cs_access.cpp} | 0 src/core/{cs_akick.c => cs_akick.cpp} | 0 src/core/{cs_ban.c => cs_ban.cpp} | 0 src/core/{cs_clear.c => cs_clear.cpp} | 0 src/core/{cs_drop.c => cs_drop.cpp} | 0 src/core/{cs_forbid.c => cs_forbid.cpp} | 0 src/core/{cs_getkey.c => cs_getkey.cpp} | 0 src/core/{cs_help.c => cs_help.cpp} | 0 src/core/{cs_info.c => cs_info.cpp} | 0 src/core/{cs_invite.c => cs_invite.cpp} | 0 src/core/{cs_kick.c => cs_kick.cpp} | 0 src/core/{cs_list.c => cs_list.cpp} | 0 src/core/{cs_modes.c => cs_modes.cpp} | 0 src/core/{cs_register.c => cs_register.cpp} | 0 src/core/{cs_set.c => cs_set.cpp} | 0 src/core/{cs_status.c => cs_status.cpp} | 0 src/core/{cs_suspend.c => cs_suspend.cpp} | 0 src/core/{cs_topic.c => cs_topic.cpp} | 0 src/core/{cs_unban.c => cs_unban.cpp} | 0 src/core/{cs_xop.c => cs_xop.cpp} | 0 src/core/{enc_md5.c => enc_md5.cpp} | 0 src/core/{enc_none.c => enc_none.cpp} | 0 src/core/{enc_old.c => enc_old.cpp} | 0 src/core/{enc_sha1.c => enc_sha1.cpp} | 0 src/core/{enc_sha256.c => enc_sha256.cpp} | 0 src/core/{hs_del.c => hs_del.cpp} | 0 src/core/{hs_delall.c => hs_delall.cpp} | 0 src/core/{hs_group.c => hs_group.cpp} | 0 src/core/{hs_help.c => hs_help.cpp} | 0 src/core/{hs_list.c => hs_list.cpp} | 0 src/core/{hs_off.c => hs_off.cpp} | 0 src/core/{hs_on.c => hs_on.cpp} | 0 src/core/{hs_set.c => hs_set.cpp} | 0 src/core/{hs_setall.c => hs_setall.cpp} | 0 src/core/{ms_cancel.c => ms_cancel.cpp} | 0 src/core/{ms_check.c => ms_check.cpp} | 0 src/core/{ms_del.c => ms_del.cpp} | 0 src/core/{ms_help.c => ms_help.cpp} | 0 src/core/{ms_info.c => ms_info.cpp} | 0 src/core/{ms_list.c => ms_list.cpp} | 0 src/core/{ms_read.c => ms_read.cpp} | 0 src/core/{ms_rsend.c => ms_rsend.cpp} | 0 src/core/{ms_send.c => ms_send.cpp} | 0 src/core/{ms_sendall.c => ms_sendall.cpp} | 0 src/core/{ms_set.c => ms_set.cpp} | 0 src/core/{ms_staff.c => ms_staff.cpp} | 0 src/core/{ns_access.c => ns_access.cpp} | 0 src/core/{ns_alist.c => ns_alist.cpp} | 0 src/core/{ns_drop.c => ns_drop.cpp} | 0 src/core/{ns_forbid.c => ns_forbid.cpp} | 0 src/core/{ns_getemail.c => ns_getemail.cpp} | 0 src/core/{ns_getpass.c => ns_getpass.cpp} | 0 src/core/{ns_ghost.c => ns_ghost.cpp} | 0 src/core/{ns_group.c => ns_group.cpp} | 0 src/core/{ns_help.c => ns_help.cpp} | 0 src/core/{ns_identify.c => ns_identify.cpp} | 0 src/core/{ns_info.c => ns_info.cpp} | 0 src/core/{ns_list.c => ns_list.cpp} | 0 src/core/{ns_logout.c => ns_logout.cpp} | 0 src/core/{ns_recover.c => ns_recover.cpp} | 0 src/core/{ns_register.c => ns_register.cpp} | 0 src/core/{ns_release.c => ns_release.cpp} | 0 src/core/{ns_resetpass.c => ns_resetpass.cpp} | 0 src/core/{ns_saset.c => ns_saset.cpp} | 0 src/core/{ns_sendpass.c => ns_sendpass.cpp} | 0 src/core/{ns_set.c => ns_set.cpp} | 0 src/core/{ns_status.c => ns_status.cpp} | 0 src/core/{ns_suspend.c => ns_suspend.cpp} | 0 src/core/{ns_update.c => ns_update.cpp} | 0 src/core/{os_akill.c => os_akill.cpp} | 0 src/core/{os_chankill.c => os_chankill.cpp} | 0 src/core/{os_chanlist.c => os_chanlist.cpp} | 0 .../{os_clearmodes.c => os_clearmodes.cpp} | 0 src/core/{os_defcon.c => os_defcon.cpp} | 0 src/core/{os_global.c => os_global.cpp} | 0 src/core/{os_help.c => os_help.cpp} | 0 src/core/{os_ignore.c => os_ignore.cpp} | 0 src/core/{os_jupe.c => os_jupe.cpp} | 0 src/core/{os_kick.c => os_kick.cpp} | 0 src/core/{os_mode.c => os_mode.cpp} | 0 src/core/{os_modinfo.c => os_modinfo.cpp} | 0 src/core/{os_modlist.c => os_modlist.cpp} | 0 src/core/{os_modload.c => os_modload.cpp} | 0 src/core/{os_modunload.c => os_modunload.cpp} | 0 src/core/{os_news.c => os_news.cpp} | 0 src/core/{os_noop.c => os_noop.cpp} | 0 src/core/{os_oline.c => os_oline.cpp} | 0 src/core/{os_quit.c => os_quit.cpp} | 0 src/core/{os_reload.c => os_reload.cpp} | 0 src/core/{os_restart.c => os_restart.cpp} | 0 src/core/{os_session.c => os_session.cpp} | 0 src/core/{os_set.c => os_set.cpp} | 0 src/core/{os_shutdown.c => os_shutdown.cpp} | 0 src/core/{os_sqline.c => os_sqline.cpp} | 0 src/core/{os_staff.c => os_staff.cpp} | 0 src/core/{os_stats.c => os_stats.cpp} | 0 src/core/{os_svsnick.c => os_svsnick.cpp} | 0 src/core/{os_szline.c => os_szline.cpp} | 0 src/core/{os_umode.c => os_umode.cpp} | 0 src/core/{os_update.c => os_update.cpp} | 0 src/core/{os_userlist.c => os_userlist.cpp} | 0 src/core/{ss_main.c => ss_main.cpp} | 0 src/{encrypt.c => encrypt.cpp} | 0 src/{hostserv.c => hostserv.cpp} | 0 src/{init.c => init.cpp} | 0 src/{ircd.c => ircd.cpp} | 0 src/{language.c => language.cpp} | 0 src/{log.c => log.cpp} | 0 src/{main.c => main.cpp} | 0 src/{memory.c => memory.cpp} | 0 src/{memoserv.c => memoserv.cpp} | 0 src/{messages.c => messages.cpp} | 0 src/{misc.c => misc.cpp} | 0 src/{modules.c => modules.cpp} | 0 src/modules/CMakeLists.txt | 3 +- src/modules/Makefile | 10 +--- .../{cs_appendtopic.c => cs_appendtopic.cpp} | 0 src/modules/{cs_enforce.c => cs_enforce.cpp} | 0 src/modules/{cs_tban.c => cs_tban.cpp} | 0 src/modules/{hs_request.c => hs_request.cpp} | 0 .../{ns_maxemail.c => ns_maxemail.cpp} | 0 src/modules/{os_info.c => os_info.cpp} | 0 src/{nickserv.c => nickserv.cpp} | 0 src/{operserv.c => operserv.cpp} | 0 src/{process.c => process.cpp} | 0 src/protocol/CMakeLists.txt | 3 +- src/protocol/Makefile | 8 +-- src/protocol/{bahamut.c => bahamut.cpp} | 0 src/protocol/{inspircd11.c => inspircd11.cpp} | 0 src/protocol/{ratbox.c => ratbox.cpp} | 0 src/protocol/{unreal32.c => unreal32.cpp} | 0 src/{send.c => send.cpp} | 0 src/{sessions.c => sessions.cpp} | 0 src/{users.c => users.cpp} | 0 159 files changed, 39 insertions(+), 60 deletions(-) rename src/{actions.c => actions.cpp} (100%) rename src/{base64.c => base64.cpp} (100%) rename src/{botserv.c => botserv.cpp} (100%) rename src/{channels.c => channels.cpp} (100%) rename src/{chanserv.c => chanserv.cpp} (100%) rename src/{commands.c => commands.cpp} (100%) rename src/{compat.c => compat.cpp} (100%) rename src/{config.c => config.cpp} (100%) rename src/core/{bs_act.c => bs_act.cpp} (100%) rename src/core/{bs_assign.c => bs_assign.cpp} (100%) rename src/core/{bs_badwords.c => bs_badwords.cpp} (100%) rename src/core/{bs_bot.c => bs_bot.cpp} (100%) rename src/core/{bs_botlist.c => bs_botlist.cpp} (100%) rename src/core/{bs_help.c => bs_help.cpp} (100%) rename src/core/{bs_info.c => bs_info.cpp} (100%) rename src/core/{bs_kick.c => bs_kick.cpp} (100%) rename src/core/{bs_say.c => bs_say.cpp} (100%) rename src/core/{bs_set.c => bs_set.cpp} (100%) rename src/core/{bs_unassign.c => bs_unassign.cpp} (100%) rename src/core/{cs_access.c => cs_access.cpp} (100%) rename src/core/{cs_akick.c => cs_akick.cpp} (100%) rename src/core/{cs_ban.c => cs_ban.cpp} (100%) rename src/core/{cs_clear.c => cs_clear.cpp} (100%) rename src/core/{cs_drop.c => cs_drop.cpp} (100%) rename src/core/{cs_forbid.c => cs_forbid.cpp} (100%) rename src/core/{cs_getkey.c => cs_getkey.cpp} (100%) rename src/core/{cs_help.c => cs_help.cpp} (100%) rename src/core/{cs_info.c => cs_info.cpp} (100%) rename src/core/{cs_invite.c => cs_invite.cpp} (100%) rename src/core/{cs_kick.c => cs_kick.cpp} (100%) rename src/core/{cs_list.c => cs_list.cpp} (100%) rename src/core/{cs_modes.c => cs_modes.cpp} (100%) rename src/core/{cs_register.c => cs_register.cpp} (100%) rename src/core/{cs_set.c => cs_set.cpp} (100%) rename src/core/{cs_status.c => cs_status.cpp} (100%) rename src/core/{cs_suspend.c => cs_suspend.cpp} (100%) rename src/core/{cs_topic.c => cs_topic.cpp} (100%) rename src/core/{cs_unban.c => cs_unban.cpp} (100%) rename src/core/{cs_xop.c => cs_xop.cpp} (100%) rename src/core/{enc_md5.c => enc_md5.cpp} (100%) rename src/core/{enc_none.c => enc_none.cpp} (100%) rename src/core/{enc_old.c => enc_old.cpp} (100%) rename src/core/{enc_sha1.c => enc_sha1.cpp} (100%) rename src/core/{enc_sha256.c => enc_sha256.cpp} (100%) rename src/core/{hs_del.c => hs_del.cpp} (100%) rename src/core/{hs_delall.c => hs_delall.cpp} (100%) rename src/core/{hs_group.c => hs_group.cpp} (100%) rename src/core/{hs_help.c => hs_help.cpp} (100%) rename src/core/{hs_list.c => hs_list.cpp} (100%) rename src/core/{hs_off.c => hs_off.cpp} (100%) rename src/core/{hs_on.c => hs_on.cpp} (100%) rename src/core/{hs_set.c => hs_set.cpp} (100%) rename src/core/{hs_setall.c => hs_setall.cpp} (100%) rename src/core/{ms_cancel.c => ms_cancel.cpp} (100%) rename src/core/{ms_check.c => ms_check.cpp} (100%) rename src/core/{ms_del.c => ms_del.cpp} (100%) rename src/core/{ms_help.c => ms_help.cpp} (100%) rename src/core/{ms_info.c => ms_info.cpp} (100%) rename src/core/{ms_list.c => ms_list.cpp} (100%) rename src/core/{ms_read.c => ms_read.cpp} (100%) rename src/core/{ms_rsend.c => ms_rsend.cpp} (100%) rename src/core/{ms_send.c => ms_send.cpp} (100%) rename src/core/{ms_sendall.c => ms_sendall.cpp} (100%) rename src/core/{ms_set.c => ms_set.cpp} (100%) rename src/core/{ms_staff.c => ms_staff.cpp} (100%) rename src/core/{ns_access.c => ns_access.cpp} (100%) rename src/core/{ns_alist.c => ns_alist.cpp} (100%) rename src/core/{ns_drop.c => ns_drop.cpp} (100%) rename src/core/{ns_forbid.c => ns_forbid.cpp} (100%) rename src/core/{ns_getemail.c => ns_getemail.cpp} (100%) rename src/core/{ns_getpass.c => ns_getpass.cpp} (100%) rename src/core/{ns_ghost.c => ns_ghost.cpp} (100%) rename src/core/{ns_group.c => ns_group.cpp} (100%) rename src/core/{ns_help.c => ns_help.cpp} (100%) rename src/core/{ns_identify.c => ns_identify.cpp} (100%) rename src/core/{ns_info.c => ns_info.cpp} (100%) rename src/core/{ns_list.c => ns_list.cpp} (100%) rename src/core/{ns_logout.c => ns_logout.cpp} (100%) rename src/core/{ns_recover.c => ns_recover.cpp} (100%) rename src/core/{ns_register.c => ns_register.cpp} (100%) rename src/core/{ns_release.c => ns_release.cpp} (100%) rename src/core/{ns_resetpass.c => ns_resetpass.cpp} (100%) rename src/core/{ns_saset.c => ns_saset.cpp} (100%) rename src/core/{ns_sendpass.c => ns_sendpass.cpp} (100%) rename src/core/{ns_set.c => ns_set.cpp} (100%) rename src/core/{ns_status.c => ns_status.cpp} (100%) rename src/core/{ns_suspend.c => ns_suspend.cpp} (100%) rename src/core/{ns_update.c => ns_update.cpp} (100%) rename src/core/{os_akill.c => os_akill.cpp} (100%) rename src/core/{os_chankill.c => os_chankill.cpp} (100%) rename src/core/{os_chanlist.c => os_chanlist.cpp} (100%) rename src/core/{os_clearmodes.c => os_clearmodes.cpp} (100%) rename src/core/{os_defcon.c => os_defcon.cpp} (100%) rename src/core/{os_global.c => os_global.cpp} (100%) rename src/core/{os_help.c => os_help.cpp} (100%) rename src/core/{os_ignore.c => os_ignore.cpp} (100%) rename src/core/{os_jupe.c => os_jupe.cpp} (100%) rename src/core/{os_kick.c => os_kick.cpp} (100%) rename src/core/{os_mode.c => os_mode.cpp} (100%) rename src/core/{os_modinfo.c => os_modinfo.cpp} (100%) rename src/core/{os_modlist.c => os_modlist.cpp} (100%) rename src/core/{os_modload.c => os_modload.cpp} (100%) rename src/core/{os_modunload.c => os_modunload.cpp} (100%) rename src/core/{os_news.c => os_news.cpp} (100%) rename src/core/{os_noop.c => os_noop.cpp} (100%) rename src/core/{os_oline.c => os_oline.cpp} (100%) rename src/core/{os_quit.c => os_quit.cpp} (100%) rename src/core/{os_reload.c => os_reload.cpp} (100%) rename src/core/{os_restart.c => os_restart.cpp} (100%) rename src/core/{os_session.c => os_session.cpp} (100%) rename src/core/{os_set.c => os_set.cpp} (100%) rename src/core/{os_shutdown.c => os_shutdown.cpp} (100%) rename src/core/{os_sqline.c => os_sqline.cpp} (100%) rename src/core/{os_staff.c => os_staff.cpp} (100%) rename src/core/{os_stats.c => os_stats.cpp} (100%) rename src/core/{os_svsnick.c => os_svsnick.cpp} (100%) rename src/core/{os_szline.c => os_szline.cpp} (100%) rename src/core/{os_umode.c => os_umode.cpp} (100%) rename src/core/{os_update.c => os_update.cpp} (100%) rename src/core/{os_userlist.c => os_userlist.cpp} (100%) rename src/core/{ss_main.c => ss_main.cpp} (100%) rename src/{encrypt.c => encrypt.cpp} (100%) rename src/{hostserv.c => hostserv.cpp} (100%) rename src/{init.c => init.cpp} (100%) rename src/{ircd.c => ircd.cpp} (100%) rename src/{language.c => language.cpp} (100%) rename src/{log.c => log.cpp} (100%) rename src/{main.c => main.cpp} (100%) rename src/{memory.c => memory.cpp} (100%) rename src/{memoserv.c => memoserv.cpp} (100%) rename src/{messages.c => messages.cpp} (100%) rename src/{misc.c => misc.cpp} (100%) rename src/{modules.c => modules.cpp} (100%) rename src/modules/{cs_appendtopic.c => cs_appendtopic.cpp} (100%) rename src/modules/{cs_enforce.c => cs_enforce.cpp} (100%) rename src/modules/{cs_tban.c => cs_tban.cpp} (100%) rename src/modules/{hs_request.c => hs_request.cpp} (100%) rename src/modules/{ns_maxemail.c => ns_maxemail.cpp} (100%) rename src/modules/{os_info.c => os_info.cpp} (100%) rename src/{nickserv.c => nickserv.cpp} (100%) rename src/{operserv.c => operserv.cpp} (100%) rename src/{process.c => process.cpp} (100%) rename src/protocol/{bahamut.c => bahamut.cpp} (100%) rename src/protocol/{inspircd11.c => inspircd11.cpp} (100%) rename src/protocol/{ratbox.c => ratbox.cpp} (100%) rename src/protocol/{unreal32.c => unreal32.cpp} (100%) rename src/{send.c => send.cpp} (100%) rename src/{sessions.c => sessions.cpp} (100%) rename src/{users.c => users.cpp} (100%) diff --git a/configure b/configure index 2d99c0b19..8342409ed 100755 --- a/configure +++ b/configure @@ -598,7 +598,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_unique_file="src/actions.c" +ac_unique_file="src/actions.cpp" # Factoring default headers for most tests. ac_includes_default="\ #include diff --git a/configure.in b/configure.in index 1bda1b300..13ba368fe 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ if test "${with_instdir+set}" != set; then exit 0 fi -AC_CONFIG_SRCDIR([src/actions.c]) +AC_CONFIG_SRCDIR([src/actions.cpp]) AC_CONFIG_HEADER(include/sysconf.h) AC_PROG_CC if test "$ac_cv_c_compiler_gnu" = "yes"; then diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cf232a77..b9c082c7b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ -# Find all the *.c and *.cpp files within the current source directory, and sort the list -file(GLOB SRC_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") +# Find all the *.cpp files within the current source directory, and sort the list file(GLOB SRC_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") set(SRC_SRCS ${SRC_SRCS_C} ${SRC_SRCS_CPP}) diff --git a/src/Makefile b/src/Makefile index e7c8ba2fb..d4ce6625e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,9 +19,6 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \ 'MAKEBIN=${MAKEBIN}' 'MYSQLDIR=${MYSQLDIR}' -.c.o: - $(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $< - .cpp.o: $(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $< @@ -34,50 +31,50 @@ services: $(OBJS) $(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) $(OBJS): Makefile -actions.o: actions.c $(INCLUDES) -base64.o: base64.c $(INCLUDES) +actions.o: actions.cpp $(INCLUDES) +base64.o: base64.cpp $(INCLUDES) bots.o: bots.cpp $(INCLUDES) -botserv.o: botserv.c $(INCLUDES) -channels.o: channels.c $(INCLUDES) -chanserv.o: chanserv.c $(INCLUDES) +botserv.o: botserv.cpp $(INCLUDES) +channels.o: channels.cpp $(INCLUDES) +chanserv.o: chanserv.cpp $(INCLUDES) command.o: command.cpp $(INCLUDES) -commands.o: commands.c $(INCLUDES) -compat.o: compat.c $(INCLUDES) -config.o: config.c $(INCLUDES) +commands.o: commands.cpp $(INCLUDES) +compat.o: compat.cpp $(INCLUDES) +config.o: config.cpp $(INCLUDES) configreader.o: configreader.cpp $(INCLUDES) -encrypt.o: encrypt.c $(INCLUDES) -init.o: init.c $(INCLUDES) -ircd.o: ircd.c $(INCLUDES) -hostserv.o: hostserv.c $(INCLUDES) -language.o: language.c $(INCLUDES) -log.o: log.c $(INCLUDES) +encrypt.o: encrypt.cpp $(INCLUDES) +init.o: init.cpp $(INCLUDES) +ircd.o: ircd.cpp $(INCLUDES) +hostserv.o: hostserv.cpp $(INCLUDES) +language.o: language.cpp $(INCLUDES) +log.o: log.cpp $(INCLUDES) mail.o: mail.cpp $(INCLUDES) -main.o: main.c $(INCLUDES) -memory.o: memory.c $(INCLUDES) -memoserv.o: memoserv.c $(INCLUDES) -messages.o: messages.c $(INCLUDES) +main.o: main.cpp $(INCLUDES) +memory.o: memory.cpp $(INCLUDES) +memoserv.o: memoserv.cpp $(INCLUDES) +messages.o: messages.cpp $(INCLUDES) modes.o: modes.cpp $(INCLUDES) -modules.o: modules.c $(INCLUDES) +modules.o: modules.cpp $(INCLUDES) module.o: module.cpp $(INCLUDES) modulemanager.o: modulemanager.cpp $(INCLUDES) -misc.o: misc.c $(INCLUDES) +misc.o: misc.cpp $(INCLUDES) nickalias.o: nickalias.cpp $(INCLUDES) nickcore.o: nickcore.cpp $(INCLUDES) -nickserv.o: nickserv.c $(INCLUDES) -operserv.o: operserv.c $(INCLUDES) +nickserv.o: nickserv.cpp $(INCLUDES) +operserv.o: operserv.cpp $(INCLUDES) opertype.o: opertype.cpp $(INCLUDES) -process.o: process.c $(INCLUDES) +process.o: process.cpp $(INCLUDES) protocol.o: protocol.cpp $(INCLUDES) regchannel.o: regchannel.cpp $(INCLUDES) -send.o: send.c $(INCLUDES) +send.o: send.cpp $(INCLUDES) servers.o: servers.cpp $(INCLUDES) -sessions.o: sessions.c $(INCLUDES) -slist.o: slist.c $(INCLUDES) +sessions.o: sessions.cpp $(INCLUDES) +slist.o: slist.cpp $(INCLUDES) sockets.o: sockets.cpp $(INCLUDES) threadengine.o: threadengine.cpp $(INCLUDES) threadengine_pthread.o: threadengine_pthread.cpp $(INCLUDES) timers.o: timers.cpp $(INCLUDES) -users.o: users.c $(INCLUDES) +users.o: users.cpp $(INCLUDES) wildcard.o: wildcard.cpp $(INCLUDES) modules: DUMMY diff --git a/src/actions.c b/src/actions.cpp similarity index 100% rename from src/actions.c rename to src/actions.cpp diff --git a/src/base64.c b/src/base64.cpp similarity index 100% rename from src/base64.c rename to src/base64.cpp diff --git a/src/botserv.c b/src/botserv.cpp similarity index 100% rename from src/botserv.c rename to src/botserv.cpp diff --git a/src/channels.c b/src/channels.cpp similarity index 100% rename from src/channels.c rename to src/channels.cpp diff --git a/src/chanserv.c b/src/chanserv.cpp similarity index 100% rename from src/chanserv.c rename to src/chanserv.cpp diff --git a/src/commands.c b/src/commands.cpp similarity index 100% rename from src/commands.c rename to src/commands.cpp diff --git a/src/compat.c b/src/compat.cpp similarity index 100% rename from src/compat.c rename to src/compat.cpp diff --git a/src/config.c b/src/config.cpp similarity index 100% rename from src/config.c rename to src/config.cpp diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f8547872b..2af2b3ea9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,5 +1,4 @@ -# Find all the *.c and *.cpp files within the current source directory, and sort the list -file(GLOB CORE_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") +# Find all the *.cpp files within the current source directory, and sort the list file(GLOB CORE_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") set(CORE_SRCS ${CORE_SRCS_C} ${CORE_SRCS_CPP}) sort_list(CORE_SRCS) diff --git a/src/core/Makefile b/src/core/Makefile index 122522d69..e1dec257c 100644 --- a/src/core/Makefile +++ b/src/core/Makefile @@ -8,8 +8,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \ 'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}' -OBJECTS= $(SRCS:.c=.so) -OBJECTS+= $(SRCS:.cpp=.so) +OBJECTS= $(SRCS:.cpp=.so) CDEFS= -rdynamic -Wall all: modules subs @@ -21,10 +20,7 @@ install: distclean: spotless -.SUFFIXES: .c .cpp .so - -.c.so: - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $< +.SUFFIXES: .cpp .so .cpp.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $< diff --git a/src/core/bs_act.c b/src/core/bs_act.cpp similarity index 100% rename from src/core/bs_act.c rename to src/core/bs_act.cpp diff --git a/src/core/bs_assign.c b/src/core/bs_assign.cpp similarity index 100% rename from src/core/bs_assign.c rename to src/core/bs_assign.cpp diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.cpp similarity index 100% rename from src/core/bs_badwords.c rename to src/core/bs_badwords.cpp diff --git a/src/core/bs_bot.c b/src/core/bs_bot.cpp similarity index 100% rename from src/core/bs_bot.c rename to src/core/bs_bot.cpp diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.cpp similarity index 100% rename from src/core/bs_botlist.c rename to src/core/bs_botlist.cpp diff --git a/src/core/bs_help.c b/src/core/bs_help.cpp similarity index 100% rename from src/core/bs_help.c rename to src/core/bs_help.cpp diff --git a/src/core/bs_info.c b/src/core/bs_info.cpp similarity index 100% rename from src/core/bs_info.c rename to src/core/bs_info.cpp diff --git a/src/core/bs_kick.c b/src/core/bs_kick.cpp similarity index 100% rename from src/core/bs_kick.c rename to src/core/bs_kick.cpp diff --git a/src/core/bs_say.c b/src/core/bs_say.cpp similarity index 100% rename from src/core/bs_say.c rename to src/core/bs_say.cpp diff --git a/src/core/bs_set.c b/src/core/bs_set.cpp similarity index 100% rename from src/core/bs_set.c rename to src/core/bs_set.cpp diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.cpp similarity index 100% rename from src/core/bs_unassign.c rename to src/core/bs_unassign.cpp diff --git a/src/core/cs_access.c b/src/core/cs_access.cpp similarity index 100% rename from src/core/cs_access.c rename to src/core/cs_access.cpp diff --git a/src/core/cs_akick.c b/src/core/cs_akick.cpp similarity index 100% rename from src/core/cs_akick.c rename to src/core/cs_akick.cpp diff --git a/src/core/cs_ban.c b/src/core/cs_ban.cpp similarity index 100% rename from src/core/cs_ban.c rename to src/core/cs_ban.cpp diff --git a/src/core/cs_clear.c b/src/core/cs_clear.cpp similarity index 100% rename from src/core/cs_clear.c rename to src/core/cs_clear.cpp diff --git a/src/core/cs_drop.c b/src/core/cs_drop.cpp similarity index 100% rename from src/core/cs_drop.c rename to src/core/cs_drop.cpp diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.cpp similarity index 100% rename from src/core/cs_forbid.c rename to src/core/cs_forbid.cpp diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.cpp similarity index 100% rename from src/core/cs_getkey.c rename to src/core/cs_getkey.cpp diff --git a/src/core/cs_help.c b/src/core/cs_help.cpp similarity index 100% rename from src/core/cs_help.c rename to src/core/cs_help.cpp diff --git a/src/core/cs_info.c b/src/core/cs_info.cpp similarity index 100% rename from src/core/cs_info.c rename to src/core/cs_info.cpp diff --git a/src/core/cs_invite.c b/src/core/cs_invite.cpp similarity index 100% rename from src/core/cs_invite.c rename to src/core/cs_invite.cpp diff --git a/src/core/cs_kick.c b/src/core/cs_kick.cpp similarity index 100% rename from src/core/cs_kick.c rename to src/core/cs_kick.cpp diff --git a/src/core/cs_list.c b/src/core/cs_list.cpp similarity index 100% rename from src/core/cs_list.c rename to src/core/cs_list.cpp diff --git a/src/core/cs_modes.c b/src/core/cs_modes.cpp similarity index 100% rename from src/core/cs_modes.c rename to src/core/cs_modes.cpp diff --git a/src/core/cs_register.c b/src/core/cs_register.cpp similarity index 100% rename from src/core/cs_register.c rename to src/core/cs_register.cpp diff --git a/src/core/cs_set.c b/src/core/cs_set.cpp similarity index 100% rename from src/core/cs_set.c rename to src/core/cs_set.cpp diff --git a/src/core/cs_status.c b/src/core/cs_status.cpp similarity index 100% rename from src/core/cs_status.c rename to src/core/cs_status.cpp diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.cpp similarity index 100% rename from src/core/cs_suspend.c rename to src/core/cs_suspend.cpp diff --git a/src/core/cs_topic.c b/src/core/cs_topic.cpp similarity index 100% rename from src/core/cs_topic.c rename to src/core/cs_topic.cpp diff --git a/src/core/cs_unban.c b/src/core/cs_unban.cpp similarity index 100% rename from src/core/cs_unban.c rename to src/core/cs_unban.cpp diff --git a/src/core/cs_xop.c b/src/core/cs_xop.cpp similarity index 100% rename from src/core/cs_xop.c rename to src/core/cs_xop.cpp diff --git a/src/core/enc_md5.c b/src/core/enc_md5.cpp similarity index 100% rename from src/core/enc_md5.c rename to src/core/enc_md5.cpp diff --git a/src/core/enc_none.c b/src/core/enc_none.cpp similarity index 100% rename from src/core/enc_none.c rename to src/core/enc_none.cpp diff --git a/src/core/enc_old.c b/src/core/enc_old.cpp similarity index 100% rename from src/core/enc_old.c rename to src/core/enc_old.cpp diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.cpp similarity index 100% rename from src/core/enc_sha1.c rename to src/core/enc_sha1.cpp diff --git a/src/core/enc_sha256.c b/src/core/enc_sha256.cpp similarity index 100% rename from src/core/enc_sha256.c rename to src/core/enc_sha256.cpp diff --git a/src/core/hs_del.c b/src/core/hs_del.cpp similarity index 100% rename from src/core/hs_del.c rename to src/core/hs_del.cpp diff --git a/src/core/hs_delall.c b/src/core/hs_delall.cpp similarity index 100% rename from src/core/hs_delall.c rename to src/core/hs_delall.cpp diff --git a/src/core/hs_group.c b/src/core/hs_group.cpp similarity index 100% rename from src/core/hs_group.c rename to src/core/hs_group.cpp diff --git a/src/core/hs_help.c b/src/core/hs_help.cpp similarity index 100% rename from src/core/hs_help.c rename to src/core/hs_help.cpp diff --git a/src/core/hs_list.c b/src/core/hs_list.cpp similarity index 100% rename from src/core/hs_list.c rename to src/core/hs_list.cpp diff --git a/src/core/hs_off.c b/src/core/hs_off.cpp similarity index 100% rename from src/core/hs_off.c rename to src/core/hs_off.cpp diff --git a/src/core/hs_on.c b/src/core/hs_on.cpp similarity index 100% rename from src/core/hs_on.c rename to src/core/hs_on.cpp diff --git a/src/core/hs_set.c b/src/core/hs_set.cpp similarity index 100% rename from src/core/hs_set.c rename to src/core/hs_set.cpp diff --git a/src/core/hs_setall.c b/src/core/hs_setall.cpp similarity index 100% rename from src/core/hs_setall.c rename to src/core/hs_setall.cpp diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.cpp similarity index 100% rename from src/core/ms_cancel.c rename to src/core/ms_cancel.cpp diff --git a/src/core/ms_check.c b/src/core/ms_check.cpp similarity index 100% rename from src/core/ms_check.c rename to src/core/ms_check.cpp diff --git a/src/core/ms_del.c b/src/core/ms_del.cpp similarity index 100% rename from src/core/ms_del.c rename to src/core/ms_del.cpp diff --git a/src/core/ms_help.c b/src/core/ms_help.cpp similarity index 100% rename from src/core/ms_help.c rename to src/core/ms_help.cpp diff --git a/src/core/ms_info.c b/src/core/ms_info.cpp similarity index 100% rename from src/core/ms_info.c rename to src/core/ms_info.cpp diff --git a/src/core/ms_list.c b/src/core/ms_list.cpp similarity index 100% rename from src/core/ms_list.c rename to src/core/ms_list.cpp diff --git a/src/core/ms_read.c b/src/core/ms_read.cpp similarity index 100% rename from src/core/ms_read.c rename to src/core/ms_read.cpp diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.cpp similarity index 100% rename from src/core/ms_rsend.c rename to src/core/ms_rsend.cpp diff --git a/src/core/ms_send.c b/src/core/ms_send.cpp similarity index 100% rename from src/core/ms_send.c rename to src/core/ms_send.cpp diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.cpp similarity index 100% rename from src/core/ms_sendall.c rename to src/core/ms_sendall.cpp diff --git a/src/core/ms_set.c b/src/core/ms_set.cpp similarity index 100% rename from src/core/ms_set.c rename to src/core/ms_set.cpp diff --git a/src/core/ms_staff.c b/src/core/ms_staff.cpp similarity index 100% rename from src/core/ms_staff.c rename to src/core/ms_staff.cpp diff --git a/src/core/ns_access.c b/src/core/ns_access.cpp similarity index 100% rename from src/core/ns_access.c rename to src/core/ns_access.cpp diff --git a/src/core/ns_alist.c b/src/core/ns_alist.cpp similarity index 100% rename from src/core/ns_alist.c rename to src/core/ns_alist.cpp diff --git a/src/core/ns_drop.c b/src/core/ns_drop.cpp similarity index 100% rename from src/core/ns_drop.c rename to src/core/ns_drop.cpp diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.cpp similarity index 100% rename from src/core/ns_forbid.c rename to src/core/ns_forbid.cpp diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.cpp similarity index 100% rename from src/core/ns_getemail.c rename to src/core/ns_getemail.cpp diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.cpp similarity index 100% rename from src/core/ns_getpass.c rename to src/core/ns_getpass.cpp diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.cpp similarity index 100% rename from src/core/ns_ghost.c rename to src/core/ns_ghost.cpp diff --git a/src/core/ns_group.c b/src/core/ns_group.cpp similarity index 100% rename from src/core/ns_group.c rename to src/core/ns_group.cpp diff --git a/src/core/ns_help.c b/src/core/ns_help.cpp similarity index 100% rename from src/core/ns_help.c rename to src/core/ns_help.cpp diff --git a/src/core/ns_identify.c b/src/core/ns_identify.cpp similarity index 100% rename from src/core/ns_identify.c rename to src/core/ns_identify.cpp diff --git a/src/core/ns_info.c b/src/core/ns_info.cpp similarity index 100% rename from src/core/ns_info.c rename to src/core/ns_info.cpp diff --git a/src/core/ns_list.c b/src/core/ns_list.cpp similarity index 100% rename from src/core/ns_list.c rename to src/core/ns_list.cpp diff --git a/src/core/ns_logout.c b/src/core/ns_logout.cpp similarity index 100% rename from src/core/ns_logout.c rename to src/core/ns_logout.cpp diff --git a/src/core/ns_recover.c b/src/core/ns_recover.cpp similarity index 100% rename from src/core/ns_recover.c rename to src/core/ns_recover.cpp diff --git a/src/core/ns_register.c b/src/core/ns_register.cpp similarity index 100% rename from src/core/ns_register.c rename to src/core/ns_register.cpp diff --git a/src/core/ns_release.c b/src/core/ns_release.cpp similarity index 100% rename from src/core/ns_release.c rename to src/core/ns_release.cpp diff --git a/src/core/ns_resetpass.c b/src/core/ns_resetpass.cpp similarity index 100% rename from src/core/ns_resetpass.c rename to src/core/ns_resetpass.cpp diff --git a/src/core/ns_saset.c b/src/core/ns_saset.cpp similarity index 100% rename from src/core/ns_saset.c rename to src/core/ns_saset.cpp diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.cpp similarity index 100% rename from src/core/ns_sendpass.c rename to src/core/ns_sendpass.cpp diff --git a/src/core/ns_set.c b/src/core/ns_set.cpp similarity index 100% rename from src/core/ns_set.c rename to src/core/ns_set.cpp diff --git a/src/core/ns_status.c b/src/core/ns_status.cpp similarity index 100% rename from src/core/ns_status.c rename to src/core/ns_status.cpp diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.cpp similarity index 100% rename from src/core/ns_suspend.c rename to src/core/ns_suspend.cpp diff --git a/src/core/ns_update.c b/src/core/ns_update.cpp similarity index 100% rename from src/core/ns_update.c rename to src/core/ns_update.cpp diff --git a/src/core/os_akill.c b/src/core/os_akill.cpp similarity index 100% rename from src/core/os_akill.c rename to src/core/os_akill.cpp diff --git a/src/core/os_chankill.c b/src/core/os_chankill.cpp similarity index 100% rename from src/core/os_chankill.c rename to src/core/os_chankill.cpp diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.cpp similarity index 100% rename from src/core/os_chanlist.c rename to src/core/os_chanlist.cpp diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.cpp similarity index 100% rename from src/core/os_clearmodes.c rename to src/core/os_clearmodes.cpp diff --git a/src/core/os_defcon.c b/src/core/os_defcon.cpp similarity index 100% rename from src/core/os_defcon.c rename to src/core/os_defcon.cpp diff --git a/src/core/os_global.c b/src/core/os_global.cpp similarity index 100% rename from src/core/os_global.c rename to src/core/os_global.cpp diff --git a/src/core/os_help.c b/src/core/os_help.cpp similarity index 100% rename from src/core/os_help.c rename to src/core/os_help.cpp diff --git a/src/core/os_ignore.c b/src/core/os_ignore.cpp similarity index 100% rename from src/core/os_ignore.c rename to src/core/os_ignore.cpp diff --git a/src/core/os_jupe.c b/src/core/os_jupe.cpp similarity index 100% rename from src/core/os_jupe.c rename to src/core/os_jupe.cpp diff --git a/src/core/os_kick.c b/src/core/os_kick.cpp similarity index 100% rename from src/core/os_kick.c rename to src/core/os_kick.cpp diff --git a/src/core/os_mode.c b/src/core/os_mode.cpp similarity index 100% rename from src/core/os_mode.c rename to src/core/os_mode.cpp diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.cpp similarity index 100% rename from src/core/os_modinfo.c rename to src/core/os_modinfo.cpp diff --git a/src/core/os_modlist.c b/src/core/os_modlist.cpp similarity index 100% rename from src/core/os_modlist.c rename to src/core/os_modlist.cpp diff --git a/src/core/os_modload.c b/src/core/os_modload.cpp similarity index 100% rename from src/core/os_modload.c rename to src/core/os_modload.cpp diff --git a/src/core/os_modunload.c b/src/core/os_modunload.cpp similarity index 100% rename from src/core/os_modunload.c rename to src/core/os_modunload.cpp diff --git a/src/core/os_news.c b/src/core/os_news.cpp similarity index 100% rename from src/core/os_news.c rename to src/core/os_news.cpp diff --git a/src/core/os_noop.c b/src/core/os_noop.cpp similarity index 100% rename from src/core/os_noop.c rename to src/core/os_noop.cpp diff --git a/src/core/os_oline.c b/src/core/os_oline.cpp similarity index 100% rename from src/core/os_oline.c rename to src/core/os_oline.cpp diff --git a/src/core/os_quit.c b/src/core/os_quit.cpp similarity index 100% rename from src/core/os_quit.c rename to src/core/os_quit.cpp diff --git a/src/core/os_reload.c b/src/core/os_reload.cpp similarity index 100% rename from src/core/os_reload.c rename to src/core/os_reload.cpp diff --git a/src/core/os_restart.c b/src/core/os_restart.cpp similarity index 100% rename from src/core/os_restart.c rename to src/core/os_restart.cpp diff --git a/src/core/os_session.c b/src/core/os_session.cpp similarity index 100% rename from src/core/os_session.c rename to src/core/os_session.cpp diff --git a/src/core/os_set.c b/src/core/os_set.cpp similarity index 100% rename from src/core/os_set.c rename to src/core/os_set.cpp diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.cpp similarity index 100% rename from src/core/os_shutdown.c rename to src/core/os_shutdown.cpp diff --git a/src/core/os_sqline.c b/src/core/os_sqline.cpp similarity index 100% rename from src/core/os_sqline.c rename to src/core/os_sqline.cpp diff --git a/src/core/os_staff.c b/src/core/os_staff.cpp similarity index 100% rename from src/core/os_staff.c rename to src/core/os_staff.cpp diff --git a/src/core/os_stats.c b/src/core/os_stats.cpp similarity index 100% rename from src/core/os_stats.c rename to src/core/os_stats.cpp diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.cpp similarity index 100% rename from src/core/os_svsnick.c rename to src/core/os_svsnick.cpp diff --git a/src/core/os_szline.c b/src/core/os_szline.cpp similarity index 100% rename from src/core/os_szline.c rename to src/core/os_szline.cpp diff --git a/src/core/os_umode.c b/src/core/os_umode.cpp similarity index 100% rename from src/core/os_umode.c rename to src/core/os_umode.cpp diff --git a/src/core/os_update.c b/src/core/os_update.cpp similarity index 100% rename from src/core/os_update.c rename to src/core/os_update.cpp diff --git a/src/core/os_userlist.c b/src/core/os_userlist.cpp similarity index 100% rename from src/core/os_userlist.c rename to src/core/os_userlist.cpp diff --git a/src/core/ss_main.c b/src/core/ss_main.cpp similarity index 100% rename from src/core/ss_main.c rename to src/core/ss_main.cpp diff --git a/src/encrypt.c b/src/encrypt.cpp similarity index 100% rename from src/encrypt.c rename to src/encrypt.cpp diff --git a/src/hostserv.c b/src/hostserv.cpp similarity index 100% rename from src/hostserv.c rename to src/hostserv.cpp diff --git a/src/init.c b/src/init.cpp similarity index 100% rename from src/init.c rename to src/init.cpp diff --git a/src/ircd.c b/src/ircd.cpp similarity index 100% rename from src/ircd.c rename to src/ircd.cpp diff --git a/src/language.c b/src/language.cpp similarity index 100% rename from src/language.c rename to src/language.cpp diff --git a/src/log.c b/src/log.cpp similarity index 100% rename from src/log.c rename to src/log.cpp diff --git a/src/main.c b/src/main.cpp similarity index 100% rename from src/main.c rename to src/main.cpp diff --git a/src/memory.c b/src/memory.cpp similarity index 100% rename from src/memory.c rename to src/memory.cpp diff --git a/src/memoserv.c b/src/memoserv.cpp similarity index 100% rename from src/memoserv.c rename to src/memoserv.cpp diff --git a/src/messages.c b/src/messages.cpp similarity index 100% rename from src/messages.c rename to src/messages.cpp diff --git a/src/misc.c b/src/misc.cpp similarity index 100% rename from src/misc.c rename to src/misc.cpp diff --git a/src/modules.c b/src/modules.cpp similarity index 100% rename from src/modules.c rename to src/modules.cpp diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 6cb5b5612..a7feab5d0 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -1,5 +1,4 @@ -# Find all the *.c and *.cpp files within the current source directory, and sort the list -file(GLOB MODULES_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") +# Find all the *.cpp files within the current source directory, and sort the list file(GLOB MODULES_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") set(MODULES_SRCS ${MODULES_SRCS_C} ${MODULES_SRCS_CPP}) sort_list(MODULES_SRCS) diff --git a/src/modules/Makefile b/src/modules/Makefile index 64b9373c7..c69128ea3 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -8,8 +8,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\ 'MAKEBIN=${MAKEBIN}' 'MYSQLDIR=${MYSQLDIR}' -OBJECTS= $(SRCS:.c=.so) -OBJECTS+= $(SRCS:.cpp=.so) +OBJECTS= $(SRCS:.cpp=.so) CDEFS= -rdynamic -Wall MYSQL_ARGS = -I$(MYSQLDIR)/include/ -L$(MYSQLDIR)/lib/ -Wl,-rpath -Wl,$(MYSQLDIR)/lib/ -lmysqlpp @@ -25,12 +24,7 @@ install: distclean: spotless -.SUFFIXES: .c .cpp .so - -.c.so: - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \ - $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) $(if $(shell grep RequiredLibraries $< | grep ssl), -lssl) $(if $(shell grep RequiredLibraries $< | grep crypt), -lcrypt) \ - -I../${INCLUDEDIR} -o $@ $< +.SUFFIXES: .cpp .so .cpp.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \ diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.cpp similarity index 100% rename from src/modules/cs_appendtopic.c rename to src/modules/cs_appendtopic.cpp diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.cpp similarity index 100% rename from src/modules/cs_enforce.c rename to src/modules/cs_enforce.cpp diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.cpp similarity index 100% rename from src/modules/cs_tban.c rename to src/modules/cs_tban.cpp diff --git a/src/modules/hs_request.c b/src/modules/hs_request.cpp similarity index 100% rename from src/modules/hs_request.c rename to src/modules/hs_request.cpp diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.cpp similarity index 100% rename from src/modules/ns_maxemail.c rename to src/modules/ns_maxemail.cpp diff --git a/src/modules/os_info.c b/src/modules/os_info.cpp similarity index 100% rename from src/modules/os_info.c rename to src/modules/os_info.cpp diff --git a/src/nickserv.c b/src/nickserv.cpp similarity index 100% rename from src/nickserv.c rename to src/nickserv.cpp diff --git a/src/operserv.c b/src/operserv.cpp similarity index 100% rename from src/operserv.c rename to src/operserv.cpp diff --git a/src/process.c b/src/process.cpp similarity index 100% rename from src/process.c rename to src/process.cpp diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt index a74b49a89..abca56caf 100644 --- a/src/protocol/CMakeLists.txt +++ b/src/protocol/CMakeLists.txt @@ -1,5 +1,4 @@ -# Find all the *.c and *.cpp files within the current source directory, and sort the list -file(GLOB PROTOCOL_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") +# Find all the *.cpp files within the current source directory, and sort the list file(GLOB PROTOCOL_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") set(PROTOCOL_SRCS ${PROTOCOL_SRCS_C} ${PROTOCOL_SRCS_CPP}) sort_list(PROTOCOL_SRCS) diff --git a/src/protocol/Makefile b/src/protocol/Makefile index a40d009c2..7221ab2e2 100644 --- a/src/protocol/Makefile +++ b/src/protocol/Makefile @@ -8,8 +8,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\ 'MAKEBIN=${MAKEBIN}' -OBJECTS= $(SRCS:.c=.so) -OBJECTS+= $(SRCS:.cpp=.so) +OBJECTS= $(SRCS:.cpp=.so) CDEFS= -rdynamic -Wall all: modules subs @@ -21,10 +20,7 @@ install: distclean: clean spotless -.SUFFIXES: .c .cpp .so - -.c.so: - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $< +.SUFFIXES: .cpp .so .cpp.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $< diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.cpp similarity index 100% rename from src/protocol/bahamut.c rename to src/protocol/bahamut.cpp diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.cpp similarity index 100% rename from src/protocol/inspircd11.c rename to src/protocol/inspircd11.cpp diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.cpp similarity index 100% rename from src/protocol/ratbox.c rename to src/protocol/ratbox.cpp diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.cpp similarity index 100% rename from src/protocol/unreal32.c rename to src/protocol/unreal32.cpp diff --git a/src/send.c b/src/send.cpp similarity index 100% rename from src/send.c rename to src/send.cpp diff --git a/src/sessions.c b/src/sessions.cpp similarity index 100% rename from src/sessions.c rename to src/sessions.cpp diff --git a/src/users.c b/src/users.cpp similarity index 100% rename from src/users.c rename to src/users.cpp