Final modifications to Autotools build system to work alongside CMake build system. CMake build system will only allow out-of-source building now. Removed all old NMake Makefiles for Windows to focus on use of CMake on Windows (it's not as important to require the old system on Windows like it is on *nix).

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1878 5417fbe8-f217-4b02-8779-1006273d7864

11 files changed, 5 insertions, 356 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a8c01d0e..2d6518f5b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,10 @@ set(SRC_SRCS ${SRC_SRCS_C} ${SRC_SRCS_CPP})
 if(NOT MSVC)
   list(REMOVE_ITEM SRC_SRCS win32_memory.cpp)
 endif(NOT MSVC)
+# If not using Windows, don't include windows.cpp, as it's Windows-specific
+if(NOT WIN32)
+  list(REMOVE_ITEM SRC_SRCS windows.cpp)
+endif(NOT WIN32)
 if(CMAKE244_OR_BETTER)
   list(SORT SRC_SRCS)
 endif(CMAKE244_OR_BETTER)
diff --git a/src/Makefile b/src/Makefile
index e6d32c5f2..6395963bb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,10 +2,6 @@ OBJS =  actions.o base64.o bots.o botserv.o channels.o chanserv.o commands.o com
 		config.o datafiles.o encrypt.o events.o hashcomp.o helpserv.o hostserv.o init.o ircd.o language.o log.o mail.o main.o \
 		memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \
 		process.o send.o servers.o sessions.o slist.o sockutil.o timeout.o users.o module.o modulemanager.o configreader.o
-SRCS =  actions.c base64.c bots.cpp botserv.c channels.c chanserv.c commands.c compat.c \
-		config.c datafiles.c encrypt.c events.c hashcomp.cpp helpserv.c hostserv.c init.c ircd.c language.c log.c mail.c main.c \
-		memory.c memoserv.c messages.c misc.c modules.c news.c nickserv.c operserv.c \
-		process.c send.c servers.c sessions.c s sockutil.c timeout.c users.c module.cpp modulemanager.cpp configreader.cpp
 
 INCLUDES = ../include/commands.h ../include/defs.h  ../include/language.h \
 	../include/pseudo.h ../include/sysconf.h ../include/config.h \
diff --git a/src/core/Makefile.win32 b/src/core/Makefile.win32
deleted file mode 100644
index 75e629b8d..000000000
--- a/src/core/Makefile.win32
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../../Makefile.inc.win32
-
-SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c enc_none.c enc_md5.c enc_old.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c ss_main.c
-OBJECTS= $(SRCS:.c=.dll)
-CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:init_module /export:destroy_module /VERSION:$(VERSION)
-
-all: $(OBJECTS)
-
-distclean: clean spotless
-
-.c.dll:
-        $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
-
-clean:
-        -@del *.obj
-
-spotless: clean
-        -@del *.dll *.lib *.exp *.manifest
-
-install:
-        -@mkdir ..\..\$(DATDEST)\modules
-        -@mkdir ..\..\$(DATDEST)\modules\runtime
-        -@copy *.dll ..\..\$(DATDEST)\modules
diff --git a/src/makefile.win32 b/src/makefile.win32
deleted file mode 100644
index 7558c1ad6..000000000
--- a/src/makefile.win32
+++ /dev/null
@@ -1,117 +0,0 @@
-# Make file for Win32
-#
-# (C) 2003-2008 Anope Team
-# Contact us at info@anope.org
-#
-# Please read COPYING and README for further details.
-#
-# Based on the original code of Epona by Lara.
-# Based on the original code of Services by Andy Church.
-#
-# $Id:$
-#
-
-# Source Makefile
-
-include ../Makefile.inc.win32
-
-###########################################################################
-
-OBJS =  actions.obj base64.obj bots.obj botserv.obj channels.obj chanserv.obj commands.obj compat.obj \
-        config.obj datafiles.obj encrypt.obj events.obj helpserv.obj hostserv.obj \
-        init.obj ircd.obj language.obj log.obj mail.obj main.obj memory.obj \
-        memoserv.obj messages.obj misc.obj modules.obj mod_version.obj news.obj nickserv.obj operserv.obj \
-        process.obj send.obj servers.obj sessions.obj slist.obj sockutil.obj \
-        timeout.obj users.obj module.obj modulemanager.obj hashcomp.obj configreader.obj
-
-SRCS =  actions.c base64.c botserv.c bots.cpp channels.c chanserv.c commands.c compat.c \
-        config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c \
-        language.c log.c mail.c main.c memory.c memoserv.c messages.c misc.c \
-        modules.c mod_version.c news.c nickserv.c operserv.c process.c send.c servers.obj sessions.c \
-        slist.c sockutil.c timeout.c users.c module.cpp modulemanager.cpp hashcomp.cpp configreader.cpp
-
-###########################################################################
-
-.c.obj:
-        $(CC) $(CFLAGS) -c $<
-
-.cpp.obj:
-        $(CC) $(CFLAGS) -c $<
-
-
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS) win32.res
-        $(CC) $(OBJS) win32.res /link /debug /out:$(PROGRAM) /implib:anope.lib $(LIBS) $(LFLAGS) $(MLIBS) $(ELIBS)
-
-spotless:
-        -@erase *.obj *.exe *.exp *.lib tools\*.exe *.res win32.rc *.manifest
-
-install:
-        -@copy anope.exe ..\anope.exe
-        -@mkdir ..\$(DATDEST)\bin
-        -@copy  bin\* ..\$(DATDEST)\bin
-        -@copy anope.exe.manifest ..\anope.exe.manifest
-
-win32.res: win32.rc
-        $(RC) /l 0x409 $(RC_FLAGS) /fowin32.res win32.rc
-
-
-###########################################################################
-
-# Catch any changes in compilation options at the top of this file
-$(OBJS):
-
-actions.obj:        actions.c        ..\include\services.h
-base64.obj:        base64.c        ..\include\services.h
-bots.obj:           bots.cpp         ..\include\services.h
-botserv.obj:        botserv.c        ..\include\services.h ..\include\pseudo.h ..\include\language.h
-channels.obj:        channels.c        ..\include\services.h
-chanserv.obj:        chanserv.c        ..\include\services.h ..\include\pseudo.h
-commands.obj:        commands.c        ..\include\services.h ..\include\commands.h ..\include\language.h
-compat.obj:        compat.c        ..\include\services.h
-config.obj:        config.c        ..\include\services.h
-datafiles.obj:        datafiles.c        ..\include\services.h ..\include\datafiles.h
-encrypt.obj:        encrypt.c        ..\include\encrypt.h ..\include\sysconf.h
-events.obj:                         events.c                 ..\include\modules.h ..\include\language.h ..\include\version.h
-init.obj:                init.c                ..\include\services.h
-ircd.obj:        ircd.c                ..\include\services.h
-hashcomp.obj:     hashcomp.cpp    ..\include\services.h ..\include\hashcomp.h
-hostserv.obj:     hostserv.c      ..\include\services.h ..\include\pseudo.h
-language.obj:        language.c        ..\include\services.h ..\include\language.h
-list.obj:                list.c                ..\include\services.h
-log.obj:                log.c                ..\include\services.h ..\include\pseudo.h
-mail.obj:                mail.c                ..\include\services.h ..\include\language.h
-main.obj:                main.c                ..\include\services.h ..\include\timeout.h ..\include\version.h
-memory.obj:        memory.c        ..\include\services.h
-memoserv.obj:        memoserv.c        ..\include\services.h ..\include\pseudo.h
-messages.obj:        messages.c        ..\include\services.h ..\include\messages.h ..\include\language.h
-modules.obj:                 modules.c                        ..\include\modules.h ..\include\language.h ..\include\version.h
-module.obj:                 module.cpp                        ..\include\modules.h ..\include\language.h ..\include\version.h
-modulemanager.obj:                 modulemanager.cpp                        ..\include\modules.h ..\include\language.h ..\include\version.h
-mod_version.obj:        mod_version.c           ..\include\modules.h ..\include\version.h
-misc.obj:                misc.c                ..\include\services.h ..\include\language.h
-news.obj:                news.c                ..\include\services.h ..\include\pseudo.h
-nickserv.obj:        nickserv.c        ..\include\services.h ..\include\pseudo.h
-operserv.obj:        operserv.c        ..\include\services.h ..\include\pseudo.h
-process.obj:        process.c        ..\include\services.h ..\include\messages.h
-send.obj:                send.c                ..\include\services.h
-servers.obj:     servers.c      ..\include\services.h
-sessions.obj:     sessions.c      ..\include\services.h ..\include\pseudo.h
-slist.obj:        slist.c                ..\include\services.h ..\include\slist.h
-sockutil.obj:        sockutil.c        ..\include\services.h
-timeout.obj:        timeout.c        ..\include\services.h ..\include\timeout.h
-users.obj:        users.c                ..\include\services.h
-vsnprintf.obj:        vsnprintf.c
-
-###########################################################################
-
-..\include\services.h: ..\include\sysconf.h ..\include\config.h ..\include\extern.h
-
-..\include\extern.h: ..\include\slist.h
-
-..\include\pseudo.h: ..\include\commands.h ..\include\language.h ..\include\timeout.h ..\include\encrypt.h ..\include\datafiles.h ..\include\slist.h
-
-###########################################################################
-
-FRC:
diff --git a/src/modules/makefile.inc.win32 b/src/modules/makefile.inc.win32
deleted file mode 100644
index f6a646329..000000000
--- a/src/modules/makefile.inc.win32
+++ /dev/null
@@ -1,2 +0,0 @@
-SRCS=cs_appendtopic.c cs_enforce.c cs_tban.c ns_maxemail.c hs_request.c os_info.c bs_fantasy_unban.c
-SUBS=test
diff --git a/src/modules/makefile.sub.win32 b/src/modules/makefile.sub.win32
deleted file mode 100644
index 4a811622e..000000000
--- a/src/modules/makefile.sub.win32
+++ /dev/null
@@ -1,19 +0,0 @@
-include ../../../Makefile.inc.win32
-
-OBJECTS= $(SRCS:.c=.obj)
-CFLAGS=/nologo /LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../../include" /I "../"
-LFLAGS=/nologo ../../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /OUT:$(TARGET)
-
-all: 
-    $(CC) $(SRCS) $(CFLAGS) ..\..\mod_version.c /link $(LFLAGS)
-
-distclean: clean spotless
-
-clean:
-        -@del *.obj
-
-spotless: clean
-        -@del *.dll *.lib *.exp *.manifest
-        
-install:
-        -@copy *.dll ..\..\..\$(DATDEST)\modules
diff --git a/src/modules/makefile.win32 b/src/modules/makefile.win32
deleted file mode 100644
index fffa51d74..000000000
--- a/src/modules/makefile.win32
+++ /dev/null
@@ -1,41 +0,0 @@
-include ../../Makefile.inc.win32
-include ./Makefile.inc.win32
-
-OBJECTS= $(SRCS:.c=.dll)
-CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:init_module /export:destroy_module
-
-all: $(OBJECTS) subs
-
-distclean: clean spotless
-
-.c.dll:
-        $(CC) $(CFLAGS) $(IRCTYPE) $< ..\mod_version.c $(LFLAGS)
-
-subs:
-        @for %i in ( $(SUBS) ); do \
-        	@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) && cd ..
-
-clean: subs-clean
-        -@del *.obj
-
-subs-clean:
-	@for %i in ( $(SUBS) ); do \
-		@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) clean && cd ..
-
-spotless: clean subs-spotless
-        -@del *.dll *.lib *.exp *.manifest
-
-subs-spotless:
-	@for %i in ( $(SUBS) ); do \
-		@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) spotless && cd ..
-
-install:
-        -@mkdir ..\..\$(DATDEST)\modules
-        -@mkdir ..\..\$(DATDEST)\modules\runtime
-        -@copy *.dll ..\..\$(DATDEST)\modules
-
-subs-install: install
-	@for %i in ( $(SUBS) ); do \
-		@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) install && cd ..
-
diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32
deleted file mode 100644
index aec850976..000000000
--- a/src/protocol/Makefile.win32
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../../Makefile.inc.win32
-
-SRCS=bahamut.c inspircd11.c inspircd12.cpp \
-     ratbox.c unreal32.c
-OBJECTS=bahamut.dll inspircd11.dll inspircd12.dll ratbox.dll unreal32.dll
-
-CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:init_module /export:destroy_module /VERSION:$(VERSION)
-
-all: $(OBJECTS)
-
-distclean: clean spotless
-
-.c.dll:
-        $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
-
-.cpp.dll:
-        $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
-
-clean:
-        -@del *.obj
-
-spotless: clean
-        -@del *.dll *.lib *.exp *.manifest
-
-install:
-        -@mkdir ..\..\$(DATDEST)\modules
-        -@mkdir ..\..\$(DATDEST)\modules\runtime
-        -@copy *.dll ..\..\$(DATDEST)\modules
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 9de555f55..5e8ec178c 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
    	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
 
 .c.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
+	@$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ -c $<
 
 all: ${OBJS}
 
diff --git a/src/tools/Makefile.win32 b/src/tools/Makefile.win32
deleted file mode 100644
index 49cd6b032..000000000
--- a/src/tools/Makefile.win32
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../../Makefile.inc.win32

-

-SRCS=anopesmtp.c db-merger.c db-convert.c

-OBJECTS= $(SRCS:.c=.exe)

-CFLAGS=$(CFLAGS) /I"../../include"

-LFLAGS=/link wsock32.lib $(LIBS) $(LFLAGS)

-

-all: $(OBJECTS)

-

-distclean: clean spotless

-

-.c.exe:

-        $(CC) $(CFLAGS) $< $(LFLAGS)

-

-clean:

-        -@del *.obj

-

-spotless: clean

-        -@del *.exe *.lib *.exp

-

-install: exe_install manifest_install

-

-exe_install: FRC

-        -@copy *.exe ..\..\$(DATDEST)\

-

-manifest_install: FRC

-        -@copy *.manifest ..\..\$(DATDEST)\

-

-FRC:

diff --git a/src/win32.rc.template b/src/win32.rc.template
deleted file mode 100644
index 7f1ee7e32..000000000
--- a/src/win32.rc.template
+++ /dev/null
@@ -1,90 +0,0 @@
-///Microsoft Developer Studio generated resource script.
-//
-#include "../include/resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include "../include/resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VER_ANOPE VERSIONINFO
- FILEVERSION VERSION_COMMA
- PRODUCTVERSION VERSION_COMMA
- FILEFLAGSMASK 0x17L10
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Anope Team"
-            VALUE "FileDescription", "Anope IRC Services"
-            VALUE "FileVersion", "VERSION_FULL"
-            VALUE "InternalName", "Anope"
-            VALUE "LegalCopyright", "Copyright (C) 2003-2008 Anope Team"
-            VALUE "OriginalFilename", "anope.exe"
-            VALUE "ProductName", "Anope"
-            VALUE "ProductVersion", "VERSION_DOTTED"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-ICON_APP                ICON                    "anope-icon.ico"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED