Fixed bug in the Glossary Haskell source (don't close stdout!).

Added missing dependencies in Flounder interfaces in the distributed memory sever.
Fixed some make rehake bugs in symbolic_targets.mk.

diff --git a/doc/001-glossary/Main.hs b/doc/001-glossary/Main.hs
index 0eca340..87dbd90 100644 (file)
--- a/doc/001-glossary/Main.hs
+++ b/doc/001-glossary/Main.hs
@@ -398,5 +398,4 @@ expand_aliases el =
 main :: IO ()
 main = do
   hPutStrLn stdout $ format_glossary glossary
-  hClose stdout
   exitWith ExitSuccess

diff --git a/hake/hake.sh b/hake/hake.sh
index f0db93b..c56f4c5 100755 (executable)
--- a/hake/hake.sh
+++ b/hake/hake.sh
@@ -139,7 +139,7 @@ if [ "$RUN_HAKE" == "No" ] ; then
 fi
 
 echo "Running hake..."
-./hake/hake --output-filename Makefile || exit
+./hake/hake --output-filename Makefile --source-dir "$SRCDIR" || exit
 cat <<EOF
 
 OK - Hake has bootstrapped.  You should now have a Makefile in this

diff --git a/hake/symbolic_targets.mk b/hake/symbolic_targets.mk
index 974fa11..343bd7d 100644 (file)
--- a/hake/symbolic_targets.mk
+++ b/hake/symbolic_targets.mk
@@ -384,7 +384,7 @@ TAGS: cscope.files
 
 # force rebuild of the Makefile
 rehake: ./hake/hake
-       ./hake/hake Makefile
+       ./hake/hake --source-dir $(SRCDIR)
 .PHONY: rehake
 
 clean::
@@ -409,6 +409,7 @@ DOCS= \
        ./docs/TN-009-Notifications.pdf \
        ./docs/TN-010-Spec.pdf \
        ./docs/TN-011-IDC.pdf \
+       ./docs/TN-012-Services.pdf \
        ./docs/TN-013-CapabilityManagement.pdf \
 
 docs doc: $(DOCS)

diff --git a/usr/mem_serv_dist/Hakefile b/usr/mem_serv_dist/Hakefile
index 459da2d..0bcacf0 100644 (file)
--- a/usr/mem_serv_dist/Hakefile
+++ b/usr/mem_serv_dist/Hakefile
@@ -14,16 +14,20 @@
 -- no stealing
   build application { target = "mem_serv_dist_ns",
                       cFiles = [ "mem_serv.c", "no_steal.c", "hybrid_support.c", "skb.c", "args.c", "memtest_trace.c" ],
-                      flounderDefs = [ "monitor", "mem" ],
-                      flounderExtraBindings = [ ("mem", ["rpcclient"]) ],
+                      flounderDefs = [ "monitor", "monitor_blocking", "mem", "spawn" ],
+                      flounderExtraBindings = [ ("mem", ["rpcclient"]), 
+                                                ("spawn", ["rpcclient"]),
+                                                ("monitor_blocking", ["rpcclient"])],
                       addLibraries = [ "mm", "trace", "skb", "dist" ]
                     },
 -- hybrid thc
   build application { target = "mem_serv_dist",
                      cFiles = [ "mem_serv.c", "steal.c", "hybrid_support.c", "skb.c", "args.c", "memtest_trace.c" ],
-                      flounderDefs = [ "monitor", "mem" ],
+                      flounderDefs = [ "monitor", "monitor_blocking", "mem", "spawn" ],
                       flounderTHCStubs = [ "mem" ],
-                      flounderExtraBindings = [ ("mem", ["rpcclient"]) ],
+                      flounderExtraBindings = [ ("mem", ["rpcclient"]),
+                                                ("spawn", ["rpcclient"]), 
+                                                ("monitor_blocking", ["rpcclient"])],
                       addLibraries = [ "mm", "trace", "skb", "dist", "thc" ],
                      architectures = [ "x86_64", "x86_32", "scc", "beehive" ]
                     },
@@ -31,9 +35,11 @@
 -- fully thc
   build application { target = "mem_serv_dist_thc",
                      cFiles = [ "mem_serv.c", "steal.c", "thc_support.c", "skb.c", "args.c", "memtest_trace.c" ],
-                      flounderDefs = [ "monitor", "mem" ],
+                      flounderDefs = [ "monitor", "monitor_blocking", "mem", "spawn" ],
                       flounderTHCStubs = [ "mem" ],
-                      flounderExtraBindings = [ ("mem", ["rpcclient"]) ],
+                      flounderExtraBindings = [ ("mem", ["rpcclient"]),
+                                                ("spawn", ["rpcclient"]),
+                                                ("monitor_blocking", ["rpcclient"])],
                       addLibraries = [ "mm", "trace", "skb", "dist", "thc" ],
                       architectures = [ "x86_64", "x86_32", "scc", "beehive" ]
                     },