diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libexpr/Makefile.am (renamed from src/nix-instantiate/Makefile.am) | 0 | ||||
| -rw-r--r-- | src/libexpr/eval.cc (renamed from src/nix-instantiate/eval.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/eval.hh (renamed from src/nix-instantiate/eval.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/fix-expr.cc (renamed from src/nix-instantiate/fix-expr.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/fix-expr.hh (renamed from src/nix-instantiate/fix-expr.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/main.cc (renamed from src/nix-instantiate/main.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/nix.sdf (renamed from src/nix-instantiate/nix.sdf) | 0 | ||||
| -rw-r--r-- | src/libexpr/nixexpr.cc (renamed from src/nix-instantiate/nixexpr.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/nixexpr.hh (renamed from src/nix-instantiate/nixexpr.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/parser.cc (renamed from src/nix-instantiate/parser.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/parser.hh (renamed from src/nix-instantiate/parser.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/primops.cc (renamed from src/nix-instantiate/primops.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/primops.hh (renamed from src/nix-instantiate/primops.hh) | 0 |
15 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1fa6e1d33f1e..09e292e1b16f 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 1f2aafcdba6d..f06bb1f1d818 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 6fe79850116e..6fe79850116e 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 b110c3a4a41c..b110c3a4a41c 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 0bc052676deb..0bc052676deb 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 e9c5a3ba633f..e9c5a3ba633f 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 6c1e51d9ccd6..6c1e51d9ccd6 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 aa6883ff84b8..aa6883ff84b8 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 615bdb974775..615bdb974775 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 816b39dc1ae3..816b39dc1ae3 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 011c2900e12a..011c2900e12a 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 b2c74af33e77..b2c74af33e77 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 5983ec5629e4..5983ec5629e4 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 097933115342..097933115342 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 76d587afdb1e..76d587afdb1e 100644 --- a/src/nix-instantiate/primops.hh +++ b/src/libexpr/primops.hh |