Merge branch 'development'

[NeonServV5.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1cf173289ddac5870bc48a78d03e5b505938079..679e1f6c98ed946673732e55de66d3453cf3234a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,10 @@ AM_CFLAGS = $(MYSQL_CFLAGS)
 BUILT_SOURCES = version.c
 version.c: checkversion
 checkversion:
-       cd src && chmod +x version.sh && ./version.sh && cd ..
+       cd src && ./version.sh && cd ..
 
 noinst_PROGRAMS = neonserv
-noinst_LTLIBRARIES = libDummyServ.la libfuncmds.la libglobalcmd.la libNeonHelp.la libNeonBackup.la libNeonServ.la libNeonSpam.la libstats.la libNeonFun.la
+noinst_LTLIBRARIES = libDummyServ.la libfuncmds.la libglobalcmd.la libNeonHelp.la libNeonBackup.la libNeonServ.la libNeonSpam.la libstats.la libNeonFun.la libNeonKick.la
 
 libDummyServ_la_SOURCES = src/modules/DummyServ.mod/bot_DummyServ.c \
       src/modules/DummyServ.mod/module.c
@@ -67,6 +67,7 @@ libNeonHelp_la_LIBADD = $(MYSQL_LIBS)
 
 libNeonBackup_la_SOURCES = src/modules/NeonBackup.mod/bot_NeonBackup.c \
       src/modules/NeonBackup.mod/cmd_neonbackup.c \
+      src/modules/NeonBackup.mod/cmd_neonbackup_recover.c \
       src/modules/NeonBackup.mod/module.c
 libNeonBackup_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
 libNeonBackup_la_LIBADD = $(MYSQL_LIBS)
@@ -97,6 +98,7 @@ libNeonServ_la_SOURCES = src/modules/NeonServ.mod/bot_NeonServ.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_invitemeall.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 \
@@ -167,11 +169,26 @@ libNeonFun_la_SOURCES = src/modules/NeonFun.mod/bot_NeonFun.c \
       src/modules/NeonFun.mod/cmd_neonfun_4stone.c \
       src/modules/NeonFun.mod/cmd_neonfun_4view.c \
       src/modules/NeonFun.mod/game_4wins.c \
+      src/modules/NeonFun.mod/cmd_neonfun_blackjack.c \
+      src/modules/NeonFun.mod/cmd_neonfun_bjtake.c \
+      src/modules/NeonFun.mod/cmd_neonfun_bjenough.c \
+      src/modules/NeonFun.mod/game_blackjack.c \
       src/modules/NeonFun.mod/module.c
 libNeonFun_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
 libNeonFun_la_LIBADD = $(MYSQL_LIBS)
 
+libNeonKick_la_SOURCES = src/modules/NeonKick.mod/bot_NeonKick.c \
+      src/modules/NeonKick.mod/module.c
+libNeonKick_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
+libNeonKick_la_LIBADD = $(MYSQL_LIBS)
+
 neonserv_SOURCES = src/version.c \
+      src/IOEngine_epoll.c \
+      src/IOEngine_kevent.c \
+      src/IOEngine_select.c \
+      src/IOEngine_win32.c \
+      src/IOHandler.c \
+      src/IOHandler_SSL.c \
       src/EventLogger.c \
       src/IRCEvents.c \
       src/main.c \
@@ -179,7 +196,6 @@ neonserv_SOURCES = src/version.c \
       src/ChanNode.c \
       src/IRCParser.c \
       src/ClientSocket.c \
-      src/ssl.c \
       src/UserNode.c \
       src/ChanUser.c \
       src/ModeNode.c \
@@ -200,7 +216,10 @@ neonserv_SOURCES = src/version.c \
       src/modules.c \
       src/module_commands.c \
       src/ModuleFunctions.c \
-      src/memoryDebug.c
+      src/statistics.c \
+      src/log.c \
+      src/memoryDebug.c \
+      src/mutexDebug.c
 
 neonserv_LDADD = $(MYSQL_LIBS) $(SYSTEM_LIBS)