Move sources under haddock-api/src

34 files changed, 3 insertions, 3 deletions

diff --git a/.ghci b/.ghci
index 5407b2c3..8166be36 100644
--- a/.ghci
+++ b/.ghci
@@ -1 +1 @@
-:set -isrc -itest -idist/build -idist/build/autogen -packageghc -optP-include -optPdist/build/autogen/cabal_macros.h
+:set --itest -idist/build -idist/build/autogen -packageghc -optP-include -optPdist/build/autogen/cabal_macros.h
diff --git a/haddock-api/.ghci b/haddock-api/.ghci
new file mode 100644
index 00000000..62e7c5d2
--- /dev/null
+++ b/haddock-api/.ghci
@@ -0,0 +1 @@
+:set -isrc -idist/build -idist/build/autogen -optP-include -optPdist/build/autogen/cabal_macros.h
diff --git a/haddock-api/src b/haddock-api/src
deleted file mode 120000
index e057607e..00000000
--- a/haddock-api/src
+++ /dev/null
@@ -1 +0,0 @@
-../src/
\ No newline at end of file
diff --git a/src/Documentation/Haddock.hs b/haddock-api/src/Documentation/Haddock.hs
index 1ff5cf75..1ff5cf75 100644
--- a/src/Documentation/Haddock.hs
+++ b/haddock-api/src/Documentation/Haddock.hs
diff --git a/src/Haddock.hs b/haddock-api/src/Haddock.hs
index 0cff5bd3..0cff5bd3 100644
--- a/src/Haddock.hs
+++ b/haddock-api/src/Haddock.hs
diff --git a/src/Haddock/Backends/HaddockDB.hs b/haddock-api/src/Haddock/Backends/HaddockDB.hs
index 1c248bfb..1c248bfb 100644
--- a/src/Haddock/Backends/HaddockDB.hs
+++ b/haddock-api/src/Haddock/Backends/HaddockDB.hs
diff --git a/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index 628e1cd0..628e1cd0 100644
--- a/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
diff --git a/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
index 7b72c030..7b72c030 100644
--- a/src/Haddock/Backends/LaTeX.hs
+++ b/haddock-api/src/Haddock/Backends/LaTeX.hs
diff --git a/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
index 9628a33d..9628a33d 100644
--- a/src/Haddock/Backends/Xhtml.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml.hs
diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index 8884f69f..8884f69f 100644
--- a/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
diff --git a/src/Haddock/Backends/Xhtml/DocMarkup.hs b/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
index 5e27d9b0..5e27d9b0 100644
--- a/src/Haddock/Backends/Xhtml/DocMarkup.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
diff --git a/src/Haddock/Backends/Xhtml/Layout.hs b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
index e84a57b3..e84a57b3 100644
--- a/src/Haddock/Backends/Xhtml/Layout.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
diff --git a/src/Haddock/Backends/Xhtml/Names.hs b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
index cf12da40..cf12da40 100644
--- a/src/Haddock/Backends/Xhtml/Names.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
diff --git a/src/Haddock/Backends/Xhtml/Themes.hs b/haddock-api/src/Haddock/Backends/Xhtml/Themes.hs
index 79b093ec..79b093ec 100644
--- a/src/Haddock/Backends/Xhtml/Themes.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Themes.hs
diff --git a/src/Haddock/Backends/Xhtml/Types.hs b/haddock-api/src/Haddock/Backends/Xhtml/Types.hs
index 122861c3..122861c3 100644
--- a/src/Haddock/Backends/Xhtml/Types.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Types.hs
diff --git a/src/Haddock/Backends/Xhtml/Utils.hs b/haddock-api/src/Haddock/Backends/Xhtml/Utils.hs
index cbcbbd6d..cbcbbd6d 100644
--- a/src/Haddock/Backends/Xhtml/Utils.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Utils.hs
diff --git a/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 73ff3f1a..73ff3f1a 100644
--- a/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
diff --git a/src/Haddock/Doc.hs b/haddock-api/src/Haddock/Doc.hs
index 91ad709f..91ad709f 100644
--- a/src/Haddock/Doc.hs
+++ b/haddock-api/src/Haddock/Doc.hs
diff --git a/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
index c06b34a6..c06b34a6 100644
--- a/src/Haddock/GhcUtils.hs
+++ b/haddock-api/src/Haddock/GhcUtils.hs
diff --git a/src/Haddock/Interface.hs b/haddock-api/src/Haddock/Interface.hs
index 60a20fe5..60a20fe5 100644
--- a/src/Haddock/Interface.hs
+++ b/haddock-api/src/Haddock/Interface.hs
diff --git a/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs
index a0bac8fc..a0bac8fc 100644
--- a/src/Haddock/Interface/AttachInstances.hs
+++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs
diff --git a/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index b66773ae..b66773ae 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
diff --git a/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs
index f1021436..f1021436 100644
--- a/src/Haddock/Interface/LexParseRn.hs
+++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs
diff --git a/src/Haddock/Interface/ParseModuleHeader.hs b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
index 6848dc63..6848dc63 100644
--- a/src/Haddock/Interface/ParseModuleHeader.hs
+++ b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
diff --git a/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index 748e0210..748e0210 100644
--- a/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
diff --git a/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index bb997b9a..bb997b9a 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
diff --git a/src/Haddock/ModuleTree.hs b/haddock-api/src/Haddock/ModuleTree.hs
index 2a7fbfcc..2a7fbfcc 100644
--- a/src/Haddock/ModuleTree.hs
+++ b/haddock-api/src/Haddock/ModuleTree.hs
diff --git a/src/Haddock/Options.hs b/haddock-api/src/Haddock/Options.hs
index b166de46..b166de46 100644
--- a/src/Haddock/Options.hs
+++ b/haddock-api/src/Haddock/Options.hs
diff --git a/src/Haddock/Parser.hs b/haddock-api/src/Haddock/Parser.hs
index ea4b7a3f..ea4b7a3f 100644
--- a/src/Haddock/Parser.hs
+++ b/haddock-api/src/Haddock/Parser.hs
diff --git a/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index 85b3a592..85b3a592 100644
--- a/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
diff --git a/src/Haddock/Utils.hs b/haddock-api/src/Haddock/Utils.hs
index ee7bfd0a..ee7bfd0a 100644
--- a/src/Haddock/Utils.hs
+++ b/haddock-api/src/Haddock/Utils.hs
diff --git a/src/Haddock/Version.hs b/haddock-api/src/Haddock/Version.hs
index 2ef3a257..2ef3a257 100644
--- a/src/Haddock/Version.hs
+++ b/haddock-api/src/Haddock/Version.hs
diff --git a/src/haddock.sh b/haddock-api/src/haddock.sh
index f1ad0191..f1ad0191 100644
--- a/src/haddock.sh
+++ b/haddock-api/src/haddock.sh
diff --git a/haddock.cabal b/haddock.cabal
index 5932b122..a31deb3a 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -28,7 +28,7 @@ extra-source-files:
   doc/haddock.xml
   haddock.spec
   haskell.vim
-  src/haddock.sh
+  haddock-api/src/haddock.sh
   html-test/src/*.hs
   html-test/ref/*.html
   latex-test/src/Simple/*.hs