make up to date with everything

diff --git a/IRCBot.dcl b/IRCBot.dcl
index a2542fd..ebe5417 100644 (file)
--- a/IRCBot.dcl
+++ b/IRCBot.dcl
@@ -3,7 +3,7 @@ definition module IRCBot
 from Data.Error import :: MaybeErrorString, :: MaybeError
 from Data.Maybe import :: Maybe
 
 from Data.Error import :: MaybeErrorString, :: MaybeError
 from Data.Maybe import :: Maybe
 

-from IRC import :: IRCMessage
+from Internet.IRC import :: IRCMessage

 
 /*
  * Spawn an IRC Bot
 
 /*
  * Spawn an IRC Bot

diff --git a/IRCBot.icl b/IRCBot.icl
index 28f53c8..2977505 100644 (file)
--- a/IRCBot.icl
+++ b/IRCBot.icl
@@ -8,7 +8,7 @@ import Data.Maybe
 import Data.Tuple
 import Text
 
 import Data.Tuple
 import Text
 

-import IRC
+import Internet.IRC

 
 import TCPServer.Connection
 
 
 import TCPServer.Connection
 

diff --git a/Makefile b/Makefile
index b7fe4b0..06e98b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CLM:=clm
 
 CLM:=clm
 

-override CLMFLAGS+=-nt
+override CLMFLAGS+=-nt -clc cocl-itasks

 
 CLMLIBS:=\
        -IL Platform\
 
 CLMLIBS:=\
        -IL Platform\


@@ -8,7 +8,7 @@ CLMLIBS:=\
        -I ./libcloogle\
        -I ./clean-selectloop/libraries
 
        -I ./libcloogle\
        -I ./clean-selectloop/libraries
 

-BINARIES:=IRC IRCBot cloogleirc #test
+BINARIES:=cloogleirc #test

 
 all: $(BINARIES)
 
 
 all: $(BINARIES)
 

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 9edcb80..44330a4 100644 (file)
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -21,7 +21,7 @@ import Text.GenJSON
 
 import Cloogle.API
 
 
 import Cloogle.API
 

-import IRC
+import Internet.IRC

 import IRCBot
 
 shorten :: String *World -> (String, *World)
 import IRCBot
 
 shorten :: String *World -> (String, *World)

diff --git a/libcloogle b/libcloogle
index 49a6c63..5ffa74d 160000 (submodule)
--- a/libcloogle
+++ b/libcloogle
@@ -1 +1 @@
-Subproject commit 49a6c636f3888f129807cd2b9d1a9cfe53e44bfd
+Subproject commit 5ffa74d10ee25696dbf3311bc981c649db777c3a