Commit 249451c9 authored by ijones's avatar ijones
Browse files

made Distribution.Make compile, clean makefile a bit

parent 80aaa17d
...@@ -59,7 +59,7 @@ import Distribution.Version (Version(..)) ...@@ -59,7 +59,7 @@ import Distribution.Version (Version(..))
-- Base -- Base
import System(getArgs) import System(getArgs)
import Control.Monad (when, unless) import Control.Monad (when)
import Data.Maybe (isNothing, maybe) import Data.Maybe (isNothing, maybe)
import Data.List ( intersperse ) import Data.List ( intersperse )
import System.IO (hPutStr, stderr) import System.IO (hPutStr, stderr)
......
...@@ -49,6 +49,7 @@ module Main where ...@@ -49,6 +49,7 @@ module Main where
import qualified Distribution.Version as D.V (hunitTests) import qualified Distribution.Version as D.V (hunitTests)
-- import qualified Distribution.InstalledPackageInfo(hunitTests) -- import qualified Distribution.InstalledPackageInfo(hunitTests)
import qualified Distribution.Misc as D.M (hunitTests) import qualified Distribution.Misc as D.M (hunitTests)
import qualified Distribution.Make ()
import qualified Distribution.Package as D.P (hunitTests) import qualified Distribution.Package as D.P (hunitTests)
import qualified Distribution.Setup as D.Setup (hunitTests) import qualified Distribution.Setup as D.Setup (hunitTests)
......
...@@ -52,6 +52,7 @@ module Distribution.Simple.Utils ( ...@@ -52,6 +52,7 @@ module Distribution.Simple.Utils (
findBinary, findBinary,
rawSystemPath, rawSystemPath,
rawSystemExit, rawSystemExit,
maybeExit,
rawSystemPathExit, rawSystemPathExit,
moveSources, moveSources,
hunitTests, hunitTests,
......
all: main all: main
main: main:
ghc -Wall --make -i../:/usr/local/src/HUnit-1.0 Distribution/ModuleTest -o moduleTest ghc -Wall --make -i../:test/HUnit-1.0/src Distribution/ModuleTest -o moduleTest
tests: tests:
cd test/A && make cd test/A && make
cd test/HUnit-1.0 && make cd test/HUnit-1.0 && make
clean: clean:
-rm -f Distribution/*.{o,hi} Distribution/Simple/*.{o,hi} -rm -f Distribution/*.{o,hi} Distribution/Simple/*.{o,hi}
rm -f library-infrastructure--darcs.tar.gz -rm -f library-infrastructure--darcs.tar.gz
check: tests main check: tests main
./moduleTest ./moduleTest
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment