Removing libcharybdis references.

diff --git a/Makefile.in b/Makefile.in
index 3104bf4d780abf9b37be7841b451007ea75818de..7714844d8a121b7281989d54a9f2b6afd237d58e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ CFLAGS                = @CFLAGS@
 # the system one.
 #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024"
 SHELL=/bin/sh
-SUBDIRS=libratbox modules extensions libcharybdis src tools servlink doc help
+SUBDIRS=libratbox modules extensions src tools servlink doc help
 CLEANDIRS = ${SUBDIRS}
 RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile
 

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 7051ba8d1681d2c9bb846ef2eece977d51bb2b3b..9005d9558f50d81588ce219e3ba42968eebcea87 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -23,7 +23,7 @@ SSL_INCLUDES  = @SSL_INCLUDES@
 
 IRCDLIBS       = @LIBS@ $(SSL_LIBS)
 
-INCLUDES       = -I. -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
+INCLUDES       = -I. -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS       = ${INCLUDES} @CPPFLAGS@
 
 SRCS =                          \

diff --git a/modules/Makefile.in b/modules/Makefile.in
index 5d840d754c020b61eaa7f736c5b21a220a9c85e2..ceb027a713e02479f98cde382f2c8a60a0b132bf 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -32,7 +32,7 @@ moduledir       = @moduledir@
 # Change this later! -- adrian
 automoduledir   = @moduledir@/autoload
 
-INCLUDES       = -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
+INCLUDES       = -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS       = ${INCLUDES} @CPPFLAGS@
 
 CORE_SRCS = \

diff --git a/src/Makefile.in b/src/Makefile.in
index 998230556293bb27786bfa2f197cc021a635ca52..044e856ca861c4c0d412812f9a7a22986379ac67 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -33,9 +33,9 @@ PROGS         = $(IRCD_EXE)
 SSL_LIBS       = @SSL_LIBS@
 SSL_INCLUDES   = @SSL_INCLUDES@
 
-IRCDLIBS       = @MODULES_LIBS@ -L../libcharybdis -lcharybdis -L../libratbox/src/.libs -lratbox @LIBS@ $(SSL_LIBS)
+IRCDLIBS       = @MODULES_LIBS@ -L../libratbox/src/.libs -lratbox @LIBS@ $(SSL_LIBS)
 
-INCLUDES       = -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
+INCLUDES       = -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS       = ${INCLUDES} @CPPFLAGS@
  
 default:       all