* Cleanup; sync with thesis.

make/examples/aterm/aterm/default.nix

@@ -19,11 +19,7 @@ rec {
     ./version.c
   ];
 
-  compile = fn: compileC {
+  compile = main: compileC {inherit main sharedLib;};
-    main = fn;
-    localIncludes = "auto";
-    forSharedLib = sharedLib;
-  };
 
   libATerm = makeLibrary {
     libraryName = "ATerm";

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 {
+  compileTest = main: link {
-    main = fn;
+    objects = [(compileC {inherit main; cFlags = "-I../aterm";})];
-    localIncludes = "auto";
+    libraries = libATerm;
-    cFlags = "-I../aterm";
   };
 
-  fib = link {objects = compile ./fib.c; libraries = libATerm;};
+  body = [
-
+    (compileTest ./fib.c)
-  primes = link {objects = compile ./primes.c; libraries = libATerm;};
+    (compileTest ./primes.c)
-  
+  ];
-  body = [fib primes];
 }

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 [])
     ];
   };