From 714b7256cd5a6783813c3d3a7468f36ba637f567 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun, 14 Aug 2005 10:19:55 +0000
Subject: [PATCH] * Cleanup; sync with thesis.

---
 make/examples/aterm/aterm/default.nix |  6 +-----
 make/examples/aterm/test/default.nix  | 21 +++++++++------------
 make/lib/default.nix                  |  4 ++--
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/make/examples/aterm/aterm/default.nix b/make/examples/aterm/aterm/default.nix
index 8b139219e9..56e830c84a 100644
--- a/make/examples/aterm/aterm/default.nix
+++ b/make/examples/aterm/aterm/default.nix
@@ -19,11 +19,7 @@ rec {
     ./version.c
   ];
 
-  compile = fn: compileC {
-    main = fn;
-    localIncludes = "auto";
-    forSharedLib = sharedLib;
-  };
+  compile = main: compileC {inherit main sharedLib;};
 
   libATerm = makeLibrary {
     libraryName = "ATerm";
diff --git a/make/examples/aterm/test/default.nix b/make/examples/aterm/test/default.nix
index b7a9dd3619..8d2bed5fc3 100644
--- a/make/examples/aterm/test/default.nix
+++ b/make/examples/aterm/test/default.nix
@@ -1,18 +1,15 @@
+with (import ../../../lib);
+
 let {
-
-  inherit (import ../../../lib) compileC link;
-
   inherit (import ../aterm {}) libATerm;
 
-  compile = fn: compileC {
-    main = fn;
-    localIncludes = "auto";
-    cFlags = "-I../aterm";
+  compileTest = main: link {
+    objects = [(compileC {inherit main; cFlags = "-I../aterm";})];
+    libraries = libATerm;
   };
 
-  fib = link {objects = compile ./fib.c; libraries = libATerm;};
-
-  primes = link {objects = compile ./primes.c; libraries = libATerm;};
-  
-  body = [fib primes];
+  body = [
+    (compileTest ./fib.c)
+    (compileTest ./primes.c)
+  ];
 }
diff --git a/make/lib/default.nix b/make/lib/default.nix
index a5059252da..a9b17d2ced 100644
--- a/make/lib/default.nix
+++ b/make/lib/default.nix
@@ -8,7 +8,7 @@ rec {
   stdenv = pkgs.stdenv;
   
 
-  compileC = {main, localIncludes ? [], cFlags ? "", forSharedLib ? false}:
+  compileC = {main, localIncludes ? "auto", cFlags ? "", sharedLib ? false}:
   stdenv.mkDerivation {
     name = "compile-c";
     builder = ./compile-c.sh;
@@ -24,7 +24,7 @@ rec {
     inherit main;
     cFlags = [
       cFlags
-      (if forSharedLib then ["-fpic"] else [])
+      (if sharedLib then ["-fpic"] else [])
     ];
   };