Merge branch 'master' into IOMultiplexer

[NeonServV5.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d3f96fed532618df49e6a7b72a59b35e3f02d46c..14de200117dbb98169087745211d8049ffec5921 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ 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 libstats.la
+noinst_LTLIBRARIES = libDummyServ.la libfuncmds.la libglobalcmd.la libNeonHelp.la libNeonBackup.la libNeonServ.la libNeonSpam.la libstats.la libNeonFun.la
 
 libDummyServ_la_SOURCES = src/modules/DummyServ.mod/bot_DummyServ.c \
       src/modules/DummyServ.mod/module.c
@@ -49,6 +49,7 @@ libglobalcmd_la_SOURCES = src/modules/global.mod/cmd_global.c \
       src/modules/global.mod/cmd_global_meminfo.c \
       src/modules/global.mod/cmd_global_extscript.c \
       src/modules/global.mod/cmd_global_move.c \
+      src/modules/global.mod/cmd_global_global.c \
       src/modules/global.mod/module.c
 libglobalcmd_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
 libglobalcmd_la_LIBADD = $(MYSQL_LIBS)
@@ -59,10 +60,17 @@ libNeonHelp_la_SOURCES = src/modules/NeonHelp.mod/bot_NeonHelp.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/cmd_neonhelp_history.c \
       src/modules/NeonHelp.mod/module.c
 libNeonHelp_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
 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/module.c
+libNeonBackup_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
+libNeonBackup_la_LIBADD = $(MYSQL_LIBS)
+
 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 \
@@ -149,7 +157,27 @@ libstats_la_SOURCES = src/modules/stats.mod/module.c
 libstats_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
 libstats_la_LIBADD = $(MYSQL_LIBS)
 
+libNeonFun_la_SOURCES = src/modules/NeonFun.mod/bot_NeonFun.c \
+      src/modules/NeonFun.mod/cmd_neonfun.c \
+      src/modules/NeonFun.mod/cmd_neonfun_uno.c \
+      src/modules/NeonFun.mod/cmd_neonfun_unoplay.c \
+      src/modules/NeonFun.mod/cmd_neonfun_unotake.c \
+      src/modules/NeonFun.mod/game_uno.c \
+      src/modules/NeonFun.mod/cmd_neonfun_4wins.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/module.c
+libNeonFun_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
+libNeonFun_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 \
@@ -157,7 +185,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 \
@@ -177,6 +204,7 @@ neonserv_SOURCES = src/version.c \
       src/QServer.c \
       src/modules.c \
       src/module_commands.c \
+      src/ModuleFunctions.c \
       src/memoryDebug.c
 
 neonserv_LDADD = $(MYSQL_LIBS) $(SYSTEM_LIBS)