Removed for-ghc, for-ghc-nofud and for-windows directories.

13 files changed, 49 insertions, 49 deletions

diff --git a/src/GF.hs b/src/GF.hs
index 52a312939..f8c032aac 100644
--- a/src/GF.hs
+++ b/src/GF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stability)
 -- Portability : (portability)
 --
--- > CVS $Date: 2005/04/21 16:21:02 $ 
+-- > CVS $Date: 2005/04/21 16:45:56 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.21 $
+-- > CVS $Revision: 1.22 $
 --
 -- The Main module of GF program.
 -----------------------------------------------------------------------------
@@ -28,7 +28,7 @@ import GF.Shell.JGF
 import GF.Text.UTF8
 
 import GF.Today (today)
-import Arch
+import GF.System.Arch
 import System (getArgs)
 import Control.Monad (foldM)
 
diff --git a/src/GF/API.hs b/src/GF/API.hs
index f339745a2..64572e041 100644
--- a/src/GF/API.hs
+++ b/src/GF/API.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:21:03 $ 
+-- > CVS $Date: 2005/04/21 16:45:57 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.32 $
+-- > CVS $Revision: 1.33 $
 --
 -- Application Programmer's Interface to GF; also used by Shell. AR 10/11/2001
 -----------------------------------------------------------------------------
@@ -61,7 +61,7 @@ import GF.UseGrammar.Editing
 
 ----import GrammarToMGrammar as M
 
-import Arch (myStdGen)
+import GF.System.Arch (myStdGen)
 
 import GF.Text.UTF8
 import GF.Data.Operations
diff --git a/src/GF/API/IOGrammar.hs b/src/GF/API/IOGrammar.hs
index c3f9e603b..987800e16 100644
--- a/src/GF/API/IOGrammar.hs
+++ b/src/GF/API/IOGrammar.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:21:06 $ 
+-- > CVS $Date: 2005/04/21 16:45:58 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.17 $
+-- > CVS $Revision: 1.18 $
 --
 -- for reading grammars and terms from strings and files
 -----------------------------------------------------------------------------
@@ -27,7 +27,7 @@ import GF.Infra.ReadFiles (isOldFile)
 import GF.Infra.Option
 import GF.Data.Operations
 import GF.Infra.UseIO
-import Arch
+import GF.System.Arch
 
 import Control.Monad (liftM)
 
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs
index 451ee3880..0b2748b0f 100644
--- a/src/GF/Compile/Compile.hs
+++ b/src/GF/Compile/Compile.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:21:35 $
+-- > CVS $Date: 2005/04/21 16:46:00 $
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.36 $
+-- > CVS $Revision: 1.37 $
 --
 -- The top-level compilation chain from source file to gfc\/gfr.
 -----------------------------------------------------------------------------
@@ -47,7 +47,7 @@ import GF.Canon.GetGFC
 
 import GF.Data.Operations
 import GF.Infra.UseIO
-import Arch
+import GF.System.Arch
 
 import Control.Monad
 
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs
index b753d0d8a..a8afb8a01 100644
--- a/src/GF/Compile/ShellState.hs
+++ b/src/GF/Compile/ShellState.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:21:47 $ 
+-- > CVS $Date: 2005/04/21 16:46:01 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.44 $
+-- > CVS $Revision: 1.45 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
@@ -32,7 +32,7 @@ import GF.CF.CanonToCF
 import GF.UseGrammar.Morphology
 import GF.Infra.Option
 import GF.Infra.Ident
-import Arch (ModTime)
+import GF.System.Arch (ModTime)
 
 import qualified GF.OldParsing.ConvertGrammar as CnvOld -- OBSOLETE
 import qualified GF.Conversion.GFC as Cnv
diff --git a/src/GF/Fudgets/ArchEdit.hs b/src/GF/Fudgets/ArchEdit.hs
index 74b31b5a9..5bc0dc84b 100644
--- a/src/GF/Fudgets/ArchEdit.hs
+++ b/src/GF/Fudgets/ArchEdit.hs
@@ -5,19 +5,19 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:10 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:46:05 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module ArchEdit (
+module GF.Fudgets.ArchEdit (
   fudlogueEdit, fudlogueWrite, fudlogueWriteUni
  ) where
 
-import CommandF
-import UnicodeF
+import GF.Fudgets.CommandF
+import GF.Fudgets.UnicodeF
 
 -- architecture/compiler dependent definitions for unix/ghc, if Fudgets works.
 -- If not, use the modules in for-ghci
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs
index 19da55ca6..e9aa1b8a8 100644
--- a/src/GF/Infra/ReadFiles.hs
+++ b/src/GF/Infra/ReadFiles.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:22:39 $ 
+-- > CVS $Date: 2005/04/21 16:46:08 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.22 $
+-- > CVS $Revision: 1.23 $
 --
 -- Decide what files to read as function of dependencies and time stamps.
 --
@@ -24,7 +24,7 @@ module GF.Infra.ReadFiles (-- * Heading 1
 		  gfcFile,gfFile,gfrFile,isGFC,resModName,isOldFile
 		 ) where
 
-import Arch (selectLater, modifiedFiles, ModTime, getModTime,laterModTime)
+import GF.System.Arch (selectLater, modifiedFiles, ModTime, getModTime,laterModTime)
 
 import GF.Infra.Option
 import GF.Data.Operations
diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs
index 88ef6e3b6..fb5321ce9 100644
--- a/src/GF/Infra/UseIO.hs
+++ b/src/GF/Infra/UseIO.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:22:40 $ 
+-- > CVS $Date: 2005/04/21 16:46:09 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.11 $
+-- > CVS $Revision: 1.12 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 module GF.Infra.UseIO where
 
 import GF.Data.Operations
-import Arch (prCPU)
+import GF.System.Arch (prCPU)
 import GF.Infra.Option
 
 import System.IO
diff --git a/src/GF/Shell/PShell.hs b/src/GF/Shell/PShell.hs
index b84e3c4f3..92574ff9b 100644
--- a/src/GF/Shell/PShell.hs
+++ b/src/GF/Shell/PShell.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:23:22 $ 
+-- > CVS $Date: 2005/04/21 16:46:12 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.19 $
+-- > CVS $Revision: 1.20 $
 --
 -- parsing GF shell commands. AR 11\/11\/2001
 -----------------------------------------------------------------------------
@@ -22,7 +22,7 @@ import GF.Shell
 import GF.Infra.Option
 import GF.Compile.PGrammar (pzIdent, pTrm) --- (string2formsAndTerm)
 import GF.API
-import Arch(fetchCommand)
+import GF.System.Arch (fetchCommand)
 
 import Data.Char (isDigit)
 import System.IO.Error
diff --git a/src/GF/Shell/SubShell.hs b/src/GF/Shell/SubShell.hs
index 5c8c17014..5ef0459e5 100644
--- a/src/GF/Shell/SubShell.hs
+++ b/src/GF/Shell/SubShell.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:23:23 $ 
+-- > CVS $Date: 2005/04/21 16:46:12 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.8 $
+-- > CVS $Revision: 1.9 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
@@ -21,7 +21,7 @@ import GF.Infra.Option
 import GF.API
 
 import GF.Shell.CommandL
-import ArchEdit
+import GF.System.ArchEdit
 
 import Data.List
 
diff --git a/src/GF/Shell/TeachYourself.hs b/src/GF/Shell/TeachYourself.hs
index 05088c71a..5c2170f55 100644
--- a/src/GF/Shell/TeachYourself.hs
+++ b/src/GF/Shell/TeachYourself.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:23:24 $ 
+-- > CVS $Date: 2005/04/21 16:46:13 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.6 $
+-- > CVS $Revision: 1.7 $
 --
 -- translation and morphology quiz. AR 10\/5\/2000 -- 12\/4\/2002
 -----------------------------------------------------------------------------
@@ -20,7 +20,7 @@ import GF.UseGrammar.Linear
 import GF.Grammar.PrGrammar
 
 import GF.Infra.Option
-import Arch (myStdGen)
+import GF.System.Arch (myStdGen)
 import GF.Data.Operations
 import GF.Infra.UseIO
 
diff --git a/src/GF/System/Arch.hs b/src/GF/System/Arch.hs
index df3f171aa..d9f3e855c 100644
--- a/src/GF/System/Arch.hs
+++ b/src/GF/System/Arch.hs
@@ -5,22 +5,22 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:34 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:46:14 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- architecture\/compiler dependent definitions for unix\/hbc
 -----------------------------------------------------------------------------
 
-module Arch (
+module GF.System.Arch (
  myStdGen, prCPU, selectLater, modifiedFiles, ModTime, getModTime,getNowTime,
  welcomeArch, fetchCommand, laterModTime) where
 
-import Time
-import Random
-import CPUTime
-import Monad (filterM)
-import Directory
+import System.Time
+import System.Random
+import System.CPUTime
+import Control.Monad (filterM)
+import System.Directory
 import System.Console.Readline
 
 ---- import qualified UnicodeF as U --(fudlogueWrite)
diff --git a/src/GF/System/ArchEdit.hs b/src/GF/System/ArchEdit.hs
index 89a92faaf..39b558cef 100644
--- a/src/GF/System/ArchEdit.hs
+++ b/src/GF/System/ArchEdit.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/30 12:41:12 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:46:15 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module ArchEdit (
+module GF.System.ArchEdit (
   fudlogueEdit, fudlogueWrite, fudlogueWriteUni
  ) where