X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=Makefile.am;h=47222e6cf91326166f898f35317f9f8e561fe2de;hp=ad6a87d2e04aacef5d03aa8ae07788c3069019c0;hb=740649d6f206dc1f65e7550a842cf298fac7cb36;hpb=cbe6ef12f3808f863e2143def86c696b46716b1e

diff --git a/Makefile.am b/Makefile.am
index ad6a87d..47222e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 AM_CFLAGS = $(MYSQL_CFLAGS)
 
-CFLAGS = -g -O2 -Wall -Wshadow -Werror
-
 BUILT_SOURCES = version.c
 version.c: checkversion
 checkversion:
@@ -16,10 +14,12 @@ 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 \
       src/BanNode.c \
+      src/IPNode.c \
       src/WHOHandler.c \
       src/modcmd.c \
       src/mysqlConn.c \
@@ -28,19 +28,24 @@ neonserv_SOURCES = src/version.c \
       src/tools.c \
       src/timeq.c \
       src/DBHelper.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_neonserv_bind.c \
+      src/cmd_global_bind.c \
       src/cmd_neonserv_chanservsync.c \
       src/cmd_neonserv_clvl.c \
-      src/cmd_neonserv_command.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 \
@@ -52,10 +57,10 @@ neonserv_SOURCES = src/version.c \
       src/cmd_neonserv_devoiceall.c \
       src/cmd_neonserv_down.c \
       src/cmd_neonserv_downall.c \
-      src/cmd_neonserv_emote.c \
+      src/cmd_global_emote.c \
       src/cmd_neonserv_events.c \
       src/cmd_neonserv_giveowner.c \
-      src/cmd_neonserv_god.c \
+      src/cmd_global_god.c \
       src/cmd_neonserv_help.c \
       src/cmd_neonserv_invite.c \
       src/cmd_neonserv_inviteme.c \
@@ -65,21 +70,21 @@ neonserv_SOURCES = src/version.c \
       src/cmd_neonserv_mode.c \
       src/cmd_neonserv_move.c \
       src/cmd_neonserv_myaccess.c \
-      src/cmd_neonserv_netinfo.c \
-      src/cmd_neonserv_notice.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_neonserv_raw.c \
+      src/cmd_global_raw.c \
       src/cmd_neonserv_recover.c \
-      src/cmd_neonserv_register.c \
-      src/cmd_neonserv_reloadlang.c \
+      src/cmd_global_register.c \
+      src/cmd_global_reloadlang.c \
       src/cmd_neonserv_resync.c \
-      src/cmd_neonserv_say.c \
+      src/cmd_global_say.c \
       src/cmd_neonserv_search.c \
       src/cmd_neonserv_set.c \
-      src/cmd_neonserv_setaccess.c \
+      src/cmd_global_setaccess.c \
       src/cmd_neonserv_suspend.c \
       src/cmd_neonserv_topic.c \
       src/cmd_neonserv_trace.c \
@@ -87,14 +92,14 @@ neonserv_SOURCES = src/version.c \
       src/cmd_neonserv_unban.c \
       src/cmd_neonserv_unbanall.c \
       src/cmd_neonserv_unbanme.c \
-      src/cmd_neonserv_unbind.c \
-      src/cmd_neonserv_unregister.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_neonserv_version.c \
+      src/cmd_global_version.c \
       src/cmd_neonserv_voice.c \
       src/cmd_neonserv_voiceall.c \
       src/cmd_neonserv_wipeinfo.c \
@@ -107,7 +112,31 @@ neonserv_SOURCES = src/version.c \
       src/cmd_neonserv_rename.c \
       src/cmd_neonserv_unvisited.c \
       src/cmd_neonserv_extscript.c \
-      src/lib/ini.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_funcmds.c \
+      src/ConfigParser.c \
+      src/QServer.c
 
 neonserv_LDADD = $(MYSQL_LIBS) $(WINSOCK_LIBS)
 
@@ -117,9 +146,10 @@ install-exec-local:
 	$(INSTALL) -m 644 $(srcdir)/database.sql $(prefix)
 	$(INSTALL) -m 644 $(srcdir)/database.upgrade.sql $(prefix)
 	$(INSTALL) -m 644 $(srcdir)/database.defaults.sql $(prefix)
-	$(INSTALL) -m 600 $(srcdir)/neonserv.example.ini $(prefix)
+	$(INSTALL) -m 600 $(srcdir)/neonserv.example.conf $(prefix)
+	$(INSTALL) -m 744 $(srcdir)/language.php $(prefix)
 	@echo
 	@echo NeonServ-$(VERSION) has been installed to $(prefix)
-	@echo Edit the neonserv.example.ini and save it as neonserv.ini before you start!
+	@echo Edit the neonserv.example.conf and save it as neonserv.conf before you start!
 	@echo You should use an own database for this Bot - table names are NOT prefixed!
 	@echo