HEADS UP: First go at cabalising hs-plugins build system. Bugs have been introduced though

examples/build.mk

@@ -13,7 +13,6 @@ REALBIN=	./a.out
 API_OBJ=	api/API.o
 
 INCLUDES=   	-i$(TOP)/examples/$(TEST)/api
-PKGFLAGS=   	-package-conf $(TOP)/plugins.conf.inplace -package plugins
 GHCFLAGS=   	-Onot -cpp -fglasgow-exts
 
 .SUFFIXES : .o .hs .hi .lhs .hc .s

examples/conf/simple/prog/Main.hs

@@ -8,6 +8,9 @@ apipath = "../api"
 
 main = do
         status <- makeWith conf stub ["-i"++apipath]
+        print status
+        return ()
+{-
         o <- case status of
                 MakeFailure e   -> mapM_ putStrLn e >> error "failed"
                 MakeSuccess _ o -> return o
@@ -20,3 +23,4 @@ main = do
         putStrLn user_editor
         makeCleaner o
 
+-}

examples/dynload/io/prog/Main.hs

@@ -4,7 +4,7 @@ import API
 
 main = do
         m_v   <- dynload "../TestIO.o" ["../api"] 
-                                       ["../../../../plugins.conf.inplace"] "resource_dyn"
+                                       [] "resource_dyn"
         case m_v of
                 LoadFailure _   -> error "couldn't compile"
                 LoadSuccess _ v -> do 

examples/dynload/poly/prog/Main.hs

@@ -7,7 +7,7 @@ import API
 
 main = do 
         m_v <- dynload "../Plugin.o" ["../api"]
-                                     ["../../../../plugins.conf.inplace"] 
+                                     [] 
                                      "resource_dyn"
         case m_v of
                 LoadFailure _ -> error "didn't compile"

examples/dynload/should_fail/prog/Main.hs

@@ -5,7 +5,7 @@ import API
 main = do 
     m_v   <- dynload "../Plugin.o" 
                      ["../api"] 
-                     ["../../../../plugins.conf.inplace"] 
+                     [] 
                      "resource_dyn"
 
     case m_v of

examples/dynload/should_fail_1/prog/Main.hs

@@ -4,7 +4,7 @@ import API
 
 main = do 
     m_v   <- dynload "../Plugin.o" ["../api"] 
-                                   ["../../../../plugins.conf.inplace"] "resource_dyn"
+                                   [] "resource_dyn"
     case m_v of
         LoadFailure _   -> putStrLn "didn't compile"
         LoadSuccess _ v -> putStrLn $ (function v)

examples/dynload/simple/prog/Main.hs

@@ -7,7 +7,7 @@ import API
 
 main = do 
         m_v <- dynload "../Plugin.o" ["../api"]
-                                     ["../../../../plugins.conf.inplace"] 
+                                     []
                                      "resource_dyn"
         case m_v of
                 LoadFailure _   -> error "didn't compile"

examples/eval.mk

@@ -1,8 +1,6 @@
 include $(TOP)/config.mk
 include $(TOP)/examples/check.mk
 
-PKGFLAGS=	-package-conf $(TOP)/plugins.conf.inplace -package plugins
-
 BIN=a.out
 SRC=Main.hs
 

examples/foreign.mk

@@ -3,7 +3,6 @@ include $(TOP)/examples/check.mk
 
 
 INCLUDES=   -I$(TOP)
-PKGFLAGS=   -package-conf $(TOP)/plugins.conf.inplace -package plugins
 
 # compile with GHC to save us setting all the necessary include and
 # lib flags. use ghc -v to find out what these are if you wish to go