Reverting my last 2 commits in an attempt to fix my own screwball mistake.

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

13 files changed, 4 insertions, 681 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index 2d6518f5b..000000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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")
-file(GLOB SRC_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
-set(SRC_SRCS ${SRC_SRCS_C} ${SRC_SRCS_CPP})
-# If not using Visual Studio, don't include win32_memory.cpp, it's only required by Visual Studio to override it's override of the new/delete operators
-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)
-
-# Set all the files to use C++ as well as set their compile flags (use the module-specific compile flags, though)
-set_source_files_properties(${SRC_SRCS} PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}")
-
-# Iterate through all the source files
-foreach(SRC ${SRC_SRCS})
-  # Calculate the header file dependencies for the given source file
-  calculate_depends(${SRC})
-endforeach(SRC)
-
-# Under Windows, we also include a resource file to the build
-if(WIN32)
-  # Make sure that the resource file is seen as an RC file to be compiled with a resource compiler, not a C++ compiler
-  set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/win32.rc LANGUAGE RC)
-  # Add the resource file to the list of sources
-  append_to_list(SRC_SRCS ${CMAKE_CURRENT_BINARY_DIR}/win32.rc)
-  # For MinGW, we have to change the compile flags
-  if(MINGW)
-    set(RC_CFLAGS "-DMINGW -Ocoff -I${Anope_SOURCE_DIR}/include")
-    # If any sort of debugging is being enabled, add a _DEBUG define to the flags for the resource compiler
-    if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
-      set(RC_CFLAGS "${RC_CFLAGS} -D_DEBUG")
-    endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/win32.rc COMPILE_FLAGS "${RC_CFLAGS}")
-  # For anything else, assumingly Visual Studio at this point, use a different set of compile flags
-  else(MINGW)
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/win32.rc COMPILE_FLAGS "/i\"${Anope_SOURCE_DIR}/include\"")
-  endif(MINGW)
-  if(IN_SOURCE)
-    # Add the resource file to the list of files for CPack to ignore
-    add_to_cpack_ignored_files("win32.rc$" TRUE)
-  endif(IN_SOURCE)
-endif(WIN32)
-
-# Generate the Anope executable and set it's linker flags, also set it to export it's symbols even though it's not a module
-add_executable(${PROGRAM_NAME} ${SRC_SRCS})
-set_target_properties(${PROGRAM_NAME} PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}" ENABLE_EXPORTS ON)
-# On Windows, also link Anope to the wsock32 library, as well as set the version
-if(WIN32)
-  target_link_libraries(${PROGRAM_NAME} wsock32)
-  set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}")
-endif(WIN32)
-# Building the Anope executable requires the language files to be compiled first as well as the version.h header to be generated
-add_dependencies(${PROGRAM_NAME} language headers)
-
-# Get the filename of the Anope executable as it is in on this system
-get_target_property(SERVICES_BINARY ${PROGRAM_NAME} LOCATION)
-get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)
-set(SERVICES_BIN "${SERVICES_BINARY}")
-if(IN_SOURCE)
-  # Add the Anope executable to the list of files for CPack to ignore
-  add_to_cpack_ignored_files("${SERVICES_BINARY}$" TRUE)
-endif(IN_SOURCE)
-
-# Generate sysconf.h from the earlier configuration
-configure_file(${Anope_SOURCE_DIR}/include/sysconf.h.cmake ${Anope_BINARY_DIR}/include/sysconf.h)
-
-# Go into the following directories and run their CMakeLists.txt as well
-add_subdirectory(bin)
-add_subdirectory(core)
-add_subdirectory(modules)
-add_subdirectory(protocol)
-add_subdirectory(tools)
-
-# Set Anope to be installed to the bin directory
-install(TARGETS ${PROGRAM_NAME}
-  DESTINATION .
-)
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 6395963bb..000000000
--- a/src/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-OBJS =  actions.o base64.o bots.o botserv.o channels.o chanserv.o commands.o compat.o \
-		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
-
-INCLUDES = ../include/commands.h ../include/defs.h  ../include/language.h \
-	../include/pseudo.h ../include/sysconf.h ../include/config.h \
-	../include/encrypt.h ../include/messages.h ../include/services.h \
-	../include/timeout.h ../include/datafiles.h ../include/extern.h \
-	../include/modules.h ../include/slist.h ../include/hashcomp.h
-
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
-	   'MAKEBIN=${MAKEBIN}'
-
-.c.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
-
-.cpp.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
-
-all: services
-
-distclean: spotless
-distclean_modules: clean_modules spotless
-
-services:  $(OBJS) mod_version
-	@$(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
-
-$(OBJS): Makefile
-actions.o:      actions.c   $(INCLUDES)
-base64.o:       base64.c    $(INCLUDES)
-bots.o:         bots.cpp    $(INCLUDES)
-botserv.o:      botserv.c   $(INCLUDES)
-channels.o:     channels.c  $(INCLUDES)
-chanserv.o:     chanserv.c  $(INCLUDES)
-commands.o:     commands.c  $(INCLUDES)
-compat.o:       compat.c    $(INCLUDES)
-config.o:       config.c    $(INCLUDES)
-datafiles.o:    datafiles.c $(INCLUDES)
-encrypt.o:      encrypt.c   $(INCLUDES)
-events.o:       events.c    $(INCLUDES)
-init.o:         init.c      $(INCLUDES)
-ircd.o:         ircd.c      $(INCLUDES)
-helpserv.o:     helpserv.c  $(INCLUDES)
-hostserv.o:     hostserv.c  $(INCLUDES)
-language.o:     language.c  $(INCLUDES)
-log.o:          log.c       $(INCLUDES)
-mail.o:         mail.c      $(INCLUDES)
-main.o:         main.c      $(INCLUDES)
-memory.o:       memory.c    $(INCLUDES)
-memoserv.o:     memoserv.c  $(INCLUDES)
-messages.o:     messages.c  $(INCLUDES)
-modules.o:      modules.c   $(INCLUDES)
-module.o:       module.cpp   $(INCLUDES)
-modulemanager.o:      modulemanager.cpp   $(INCLUDES)
-misc.o:         misc.c      $(INCLUDES)
-news.o:         news.c      $(INCLUDES)
-nickserv.o:     nickserv.c  $(INCLUDES)
-operserv.o:     operserv.c  $(INCLUDES)
-process.o:      process.c   $(INCLUDES)
-send.o:         send.c      $(INCLUDES)
-servers.o:      servers.c   $(INCLUDES)
-sessions.o:     sessions.c  $(INCLUDES)
-slist.o:        slist.c     $(INCLUDES)
-sockutil.o:     sockutil.c  $(INCLUDES)
-timeout.o:      timeout.c   $(INCLUDES)
-users.o:        users.c     $(INCLUDES)
-vsnprintf.o:    vsnprintf.c $(INCLUDES)
-
-mod_version:	mod_version.c	$(INCLUDES)
-	@$(MAKEBIN) $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
-
-modules: DUMMY
-	@modules/configure modules
-	@${MAKE} -C modules ${MAKEARGS} all
-
-protocols: DUMMY
-	@protocol/configure protocol
-	@${MAKE} -C protocol ${MAKEARGS} all
-
-core: DUMMY
-	@core/configure core
-	@${MAKE} -C core ${MAKEARGS} all
-
-clean: clean_modules clean_protocols clean_core
-	rm -f *.o services a.out
-
-clean_modules:
-	@touch modules/Makefile.inc # Horribly ugly...
-	@${MAKE} -C modules clean
-
-clean_protocols:
-	@touch protocol/Makefile.inc
-	@${MAKE} -C protocol clean
-
-clean_core:
-	@touch core/Makefile.inc
-	@${MAKE} -C core clean
-
-spotless:
-	@${MAKE} -C modules distclean
-	@${MAKE} -C protocol distclean
-	@${MAKE} -C core distclean
-
-install: services
-	test -d ${INSTDIR} || mkdir ${INSTDIR}
-	$(INSTALL) services $(INSTDIR)/services
-	$(INSTALL) bin/anoperc $(INSTDIR)/anoperc
-	(cd ../lang ; $(MAKE) install)
-	$(CP) ../data/* $(INSTDIR)/data
-	$(INSTALL) bin/mydbgen $(INSTDIR)/data/mydbgen
-	test -d $(INSTDIR)/data/backups || mkdir $(INSTDIR)/data/backups
-	test -d $(INSTDIR)/data/logs || mkdir $(INSTDIR)/data/logs
-	@if [ "$(INSTDIR)/data/modules" ] ; then \
-		test -d ${INSTDIR}/data/modules || mkdir ${INSTDIR}/data/modules ; \
-		test -d ${INSTDIR}/data/modules/runtime || mkdir ${INSTDIR}/data/modules/runtime ; \
-		(cd modules ; $(MAKE) install) ; \
-		(cd protocol ; ${MAKE} install) ; \
-		(cd core ; ${MAKE} install) ; \
-	fi
-	@if [ "$(RUNGROUP)" ] ; then \
-		echo chgrp -R $(RUNGROUP) $(INSTDIR)/data ; \
-		chgrp -R $(RUNGROUP) $(INSTDIR)/data ; \
-		echo chmod -R g+rw $(INSTDIR)/data ; \
-		chmod -R g+rw $(INSTDIR)/data ; \
-		echo find $(INSTDIR)/data -type d -exec chmod g+xs \'\{\}\' \\\; ; \
-		find $(INSTDIR)/data -type d -exec chmod g+xs '{}' \; ; \
-	fi
-
-DUMMY:
diff --git a/src/bin/anoperc.in b/src/bin/anoperc.in
index 3e7cbec62..02c5bf18e 100644
--- a/src/bin/anoperc.in
+++ b/src/bin/anoperc.in
@@ -15,9 +15,9 @@
 
 
 
-ANOPEPID="@INSTDIR@/data/services.pid"
-ANOPROG="@INSTDIR@/services"
-LOG="@INSTDIR@/data/logs/"
+ANOPEPID="@DATADIR@/services.pid"
+ANOPROG="@BINDIR@/services"
+LOG="@DATADIR@/logs/"
 ARCVERSION="1.2"
 
 isAnopeRunning () {
@@ -134,7 +134,7 @@ elif [ "$1" = "help" ] ; then
 		echo "folder or make use of our extensive online support at"
 		echo "http://www.anope.org/"
 	fi
-
+	
 else
 	echo "Anope Remote Control ($ARCVERSION)"
 	echo "Usage: $0 [start|stop|status|restart|rehash|version|help]"
diff --git a/src/core/Makefile b/src/core/Makefile
deleted file mode 100644
index f4df49581..000000000
--- a/src/core/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-include ./Makefile.inc
-
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \
-	   'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}'
-
-OBJECTS= $(SRCS:.c=.o)
-SO_FILES=$(OBJECTS:.o=.s)
-CDEFS= -rdynamic -Wall
-
-all: modules subs
-
-modules: $(OBJECTS) $(SO_FILES)
-
-install:
-	$(CP) ./*.so $(INSTDIR)/data/modules
-
-distclean: spotless
-
-.c.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
-.o.s:
-	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-	@$(TOUCH) $*.s
-
-subs:
-	@for i in $(SUBS); do \
-        echo "make all in $$i..."; \
-        (cd $$i; $(MAKE) $(MAKEARGS) all); done
-
-subs_clean:
-	@for i in $(SUBS); do \
-	echo "cleaning in $$i..."; \
-	(cd $$i; $(MAKE) clean); done
-
-clean: subs_clean
-	rm -f *.o *.s *.so *.c~ core
-
-spotless: subs_clean
-	rm -f *.o *.s *.so *.c~ core Makefile.inc
-
diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
deleted file mode 100644
index 7b1099b37..000000000
--- a/src/core/Makefile.sub
+++ /dev/null
@@ -1,29 +0,0 @@
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
-
-OBJECTS= $(SRCS:.c=.o)
-SO_FILES=$(OBJECTS:.o=.s)
-CDEFS= -rdynamic -Wall
-
-all: module
-
-module: $(OBJECTS) so
-
-distclean: spotless
-
-.c.o:
-	$(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-
-so:
-	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-
-clean:
-	rm -f *.o *.so *.c~ core
-
-spotless: clean
-	rm -f *~ *.o *.so *.c~ core
-
diff --git a/src/core/configure b/src/core/configure
deleted file mode 100755
index 92efecd41..000000000
--- a/src/core/configure
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-oldpath=`pwd`
-
-if [ $1 ]; then
-	cd $1
-fi
-
-echo2 () {
-    $ECHO2 "$*$ECHO2SUF"    # these are defined later
-}
-
-ECHO2SUF=''
-if [ "`echo -n a ; echo -n b`" = "ab" ] ; then
-        ECHO2='echo -n'
-elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then
-        ECHO2='echo' ; ECHO2SUF='\c'
-elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then
-        ECHO2='printf "%s"'
-else
-        # oh well...
-        ECHO2='echo'
-fi
-export ECHO2 ECHO2SUF
-
-
-echo2 "SRCS=" > ./Makefile.inc
-FIRST=1
-for oldfile in *.c
-do
-	if [ "$FIRST" = 1 ] ; then
-		echo2 " "$oldfile >> ./Makefile.inc
-	else
-		echo "\\" >> ./Makefile.inc
-		echo2 "     " $oldfile >> ./Makefile.inc
-	fi
-	FIRST=0
-done
-echo "" >> ./Makefile.inc
-
-echo2 "SUBS=" >> ./Makefile.inc
-FIRST=1
-for dir in *
-do
-        if [ -d $dir ] ; then
-		if [ -f $dir/Makefile ] ; then
-			if [ "$FIRST" = 1 ] ; then
-				echo2 " "$dir >> ./Makefile.inc
-		        else
-				echo "\\" >> ./Makefile.inc
-				echo2 "     " $dir >> ./Makefile.inc
-			fi
-			FIRST=0
-		fi
-	fi
-done
-
-cd $oldpath
-
-exit 0
diff --git a/src/modules/Makefile b/src/modules/Makefile
deleted file mode 100644
index c964439a8..000000000
--- a/src/modules/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-include ./Makefile.inc
-
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
-	   'MAKEBIN=${MAKEBIN}'
-
-OBJECTS= $(SRCS:.c=.o)
-SO_FILES=$(OBJECTS:.o=.s)
-CDEFS= -rdynamic -Wall
-
-all: modules subs
-
-modules: $(OBJECTS) $(SO_FILES)
-
-install:
-	$(CP) ./*.so $(INSTDIR)/data/modules
-	@for i in $(SUBS); do \
-	echo "make install in $$i..."; \
-	(cd $$i; $(MAKE) $(MAKEARGS) install);done
-
-distclean: spotless
-
-.c.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
-.o.s:
-	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
-	@$(TOUCH) $*.s
-
-subs:
-	@for i in $(SUBS); do \
-        echo "make all in $$i..."; \
-        (cd $$i; $(MAKE) $(MAKEARGS) all); done
-
-subs_clean:
-	@for i in $(SUBS); do \
-	echo "cleaning in $$i..."; \
-	(cd $$i; $(MAKE) $(MAKEARGS) clean); done
-
-clean: subs_clean
-	rm -f *.o *.s *.so *.c~ core
-
-spotless:
-	rm -f *.o *.s *.so *.c~ core *.so Makefile.inc
-
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
deleted file mode 100644
index d9011d602..000000000
--- a/src/modules/Makefile.sub
+++ /dev/null
@@ -1,28 +0,0 @@
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
-
-OBJECTS= $(SRCS:.c=.o)
-SO_FILES=$(OBJECTS:.o=.s)
-CDEFS= -rdynamic -Wall
-
-all: module
-
-module: $(OBJECTS) so
-
-distclean: spotless
-
-.c.o:
-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-
-so:
-	$(CC) ${SHARED} ../../mod_version.o  $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-
-clean:
-	rm -f *.o *.so *.c~ core
-
-spotless:
-	rm -f *~ *.o *.so *.c~ core
diff --git a/src/modules/configure b/src/modules/configure
deleted file mode 100755
index 53a745592..000000000
--- a/src/modules/configure
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-oldpath=`pwd`
-
-if [ $1 ]; then
-	cd $1
-fi
-
-echo2 () {
-    $ECHO2 "$*$ECHO2SUF"    # these are defined later
-}
-
-ECHO2SUF=''
-if [ "`echo -n a ; echo -n b`" = "ab" ] ; then
-        ECHO2='echo -n'
-elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then
-        ECHO2='echo' ; ECHO2SUF='\c'
-elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then
-        ECHO2='printf "%s"'
-else
-        # oh well...
-        ECHO2='echo'
-fi
-export ECHO2 ECHO2SUF
-
-
-echo2 "SRCS=" > ./Makefile.inc
-FIRST=1
-for oldfile in *.c
-do
-	if [ "$FIRST" = 1 ] ; then
-		echo2 " "$oldfile >> ./Makefile.inc
-	else
-		echo "\\" >> ./Makefile.inc
-		echo2 "     " $oldfile >> ./Makefile.inc
-	fi
-	FIRST=0
-done
-echo "" >> ./Makefile.inc
-
-echo2 "SUBS=" >> ./Makefile.inc
-FIRST=1
-for dir in *
-do
-        if [ -d $dir ] ; then
-	        if [ -f $dir/configure ] ; then
-			cd $dir
-			./configure
-			cd ..
-		fi
-		if [ -f $dir/Makefile ] ; then
-			if [ "$FIRST" = 1 ] ; then
-				echo2 " "$dir >> ./Makefile.inc
-		        else
-				echo "\\" >> ./Makefile.inc
-				echo2 "     " $dir >> ./Makefile.inc
-			fi
-			FIRST=0
-		fi
-	fi
-done
-
-cd $oldpath
-
-exit 0
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
deleted file mode 100644
index 1a064000c..000000000
--- a/src/protocol/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-include ./Makefile.inc
-
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
-	   'MAKEBIN=${MAKEBIN}'
-
-OBJECTS= $(SRCS:.c=.o)
-OBJECTS+= $(SRCS:.cpp=.o)
-SO_FILES=$(OBJECTS:.o=.s)
-CDEFS= -rdynamic -Wall
-
-all: modules subs
-
-modules: $(OBJECTS) $(SO_FILES)
-
-install:
-	$(CP) ./*.so $(INSTDIR)/data/modules
-
-distclean: clean spotless
-
-.c.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
-.cpp.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
-.o.s:
-	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
-	@$(TOUCH) $*.s
-
-subs:
-	@for i in $(SUBS); do \
-        echo "make all in $$i..."; \
-        (cd $$i; $(MAKE) $(MAKEARGS) all); done
-
-subs_clean:
-	@for i in $(SUBS); do \
-	echo "cleaning in $$i..."; \
-	(cd $$i; $(MAKE) clean); done
-
-clean: subs_clean
-	rm -f *.o *.s *.so *.c~ core
-
-spotless: subs_clean
-	rm -f *.o *.s *.so *.c~ core *.so Makefile.inc
-
-
diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
deleted file mode 100644
index 12502d87e..000000000
--- a/src/protocol/Makefile.sub
+++ /dev/null
@@ -1,32 +0,0 @@
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
-
-OBJECTS= $(SRCS:.c=.o)
-SO_FILES=$(OBJECTS:.o=.s)
-CDEFS= -rdynamic -Wall
-
-all: module
-
-module: $(OBJECTS) so
-
-distclean: spotless
-
-.c.o:
-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-
-.cpp.o:
-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-
-so:
-	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-
-clean:
-	rm -f *.o *.so *.c~ core
-
-spotless: clean
-	rm -f *~ *.o *.so *.c~ core
-
diff --git a/src/protocol/configure b/src/protocol/configure
deleted file mode 100755
index 63f522d38..000000000
--- a/src/protocol/configure
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-oldpath=`pwd`
-
-if [ $1 ]; then
-	cd $1
-fi
-
-echo2 () {
-    $ECHO2 "$*$ECHO2SUF"    # these are defined later
-}
-
-ECHO2SUF=''
-if [ "`echo -n a ; echo -n b`" = "ab" ] ; then
-        ECHO2='echo -n'
-elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then
-        ECHO2='echo' ; ECHO2SUF='\c'
-elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then
-        ECHO2='printf "%s"'
-else
-        # oh well...
-        ECHO2='echo'
-fi
-export ECHO2 ECHO2SUF
-
-
-echo2 "SRCS=" > ./Makefile.inc
-FIRST=1
-for oldfile in `ls -1 *.c *.cpp`
-do
-	if [ "$FIRST" = 1 ] ; then
-		echo2 " "$oldfile >> ./Makefile.inc
-	else
-		echo "\\" >> ./Makefile.inc
-		echo2 "     " $oldfile >> ./Makefile.inc
-	fi
-	FIRST=0
-done
-echo "" >> ./Makefile.inc
-
-echo2 "SUBS=" >> ./Makefile.inc
-FIRST=1
-for dir in *
-do
-        if [ -d $dir ] ; then
-		if [ -f $dir/Makefile ] ; then
-			if [ "$FIRST" = 1 ] ; then
-				echo2 " "$dir >> ./Makefile.inc
-		        else
-				echo "\\" >> ./Makefile.inc
-				echo2 "     " $dir >> ./Makefile.inc
-			fi
-			FIRST=0
-		fi
-	fi
-done
-
-cd $oldpath
-
-exit 0
diff --git a/src/tools/Makefile b/src/tools/Makefile
deleted file mode 100644
index 5e8ec178c..000000000
--- a/src/tools/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-SRCS =  anopesmtp.c db-merger.c db-convert.c
-OBJS =  $(SRCS:.c=.o)
-
-INCLUDES = ../../include/services.h
-
-MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
-           'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
-
-.c.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ -c $<
-
-all: ${OBJS}
-
-distclean: spotless
-
-anopesmpt:  $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
-
-$(OBJS): Makefile
-anopesmtp.o:    anopesmtp.c $(INCLUDES)
-db-merger.o:    db-merger.c $(INCLUDES)
-db-convert.o:	db-convert.c $(INCLUDES)
-
-clean:
-	rm -f *.o anopesmtp a.out db-merger db-convert
-
-spotless: clean
-
-install: anopesmtp db-merger db-convert
-	test -d ${INSTDIR} || mkdir ${INSTDIR}
-	test -d $(INSTDIR)/tools || mkdir $(INSTDIR)/tools
-	$(INSTALL) anopesmtp $(INSTDIR)/tools/anopesmtp
-	$(INSTALL) db-merger $(INSTDIR)/tools/db-merger
-	$(INSTALL) db-convert $(INSTDIR)/tools/db-convert
-
-DUMMY: