* Refactoring: put the Nix expression evaluator in its own library so

  that it can be used by multiple programs.

15 files changed, 3 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 1fa6e1d33f..09e292e1b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_CONFIG_FILES([Makefile
    src/libmain/Makefile
    src/nix-store/Makefile
    src/nix-hash/Makefile
-   src/nix-instantiate/Makefile
+   src/libexpr/Makefile
    scripts/Makefile
    corepkgs/Makefile
    corepkgs/fetchurl/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f2aafcdba..f06bb1f1d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash nix-instantiate
+SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash \
+ libexpr #nix-instantiate
diff --git a/src/nix-instantiate/Makefile.am b/src/libexpr/Makefile.am
index 6fe7985011..6fe7985011 100644
--- a/src/nix-instantiate/Makefile.am
+++ b/src/libexpr/Makefile.am
diff --git a/src/nix-instantiate/eval.cc b/src/libexpr/eval.cc
index b110c3a4a4..b110c3a4a4 100644
--- a/src/nix-instantiate/eval.cc
+++ b/src/libexpr/eval.cc
diff --git a/src/nix-instantiate/eval.hh b/src/libexpr/eval.hh
index 0bc052676d..0bc052676d 100644
--- a/src/nix-instantiate/eval.hh
+++ b/src/libexpr/eval.hh
diff --git a/src/nix-instantiate/fix-expr.cc b/src/libexpr/fix-expr.cc
index e9c5a3ba63..e9c5a3ba63 100644
--- a/src/nix-instantiate/fix-expr.cc
+++ b/src/libexpr/fix-expr.cc
diff --git a/src/nix-instantiate/fix-expr.hh b/src/libexpr/fix-expr.hh
index 6c1e51d9cc..6c1e51d9cc 100644
--- a/src/nix-instantiate/fix-expr.hh
+++ b/src/libexpr/fix-expr.hh
diff --git a/src/nix-instantiate/main.cc b/src/libexpr/main.cc
index aa6883ff84..aa6883ff84 100644
--- a/src/nix-instantiate/main.cc
+++ b/src/libexpr/main.cc
diff --git a/src/nix-instantiate/nix.sdf b/src/libexpr/nix.sdf
index 615bdb9747..615bdb9747 100644
--- a/src/nix-instantiate/nix.sdf
+++ b/src/libexpr/nix.sdf
diff --git a/src/nix-instantiate/nixexpr.cc b/src/libexpr/nixexpr.cc
index 816b39dc1a..816b39dc1a 100644
--- a/src/nix-instantiate/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
diff --git a/src/nix-instantiate/nixexpr.hh b/src/libexpr/nixexpr.hh
index 011c2900e1..011c2900e1 100644
--- a/src/nix-instantiate/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
diff --git a/src/nix-instantiate/parser.cc b/src/libexpr/parser.cc
index b2c74af33e..b2c74af33e 100644
--- a/src/nix-instantiate/parser.cc
+++ b/src/libexpr/parser.cc
diff --git a/src/nix-instantiate/parser.hh b/src/libexpr/parser.hh
index 5983ec5629..5983ec5629 100644
--- a/src/nix-instantiate/parser.hh
+++ b/src/libexpr/parser.hh
diff --git a/src/nix-instantiate/primops.cc b/src/libexpr/primops.cc
index 0979331153..0979331153 100644
--- a/src/nix-instantiate/primops.cc
+++ b/src/libexpr/primops.cc
diff --git a/src/nix-instantiate/primops.hh b/src/libexpr/primops.hh
index 76d587afdb..76d587afdb 100644
--- a/src/nix-instantiate/primops.hh
+++ b/src/libexpr/primops.hh