26 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index cc7db29c81ee..9d4b41b6bdba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_FILES([Makefile
    src/boost/Makefile
    src/boost/format/Makefile
    src/libutil/Makefile
-   src/libnix/Makefile
+   src/libstore/Makefile
    src/libmain/Makefile
    src/nix/Makefile
    src/nix-hash/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index e62c29d7ce29..ed989fed20b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = boost libutil libnix libmain nix nix-hash fix-ng
+SUBDIRS = boost libutil libstore libmain nix nix-hash fix-ng
diff --git a/src/fix-ng/Makefile.am b/src/fix-ng/Makefile.am
index cf854932975b..df3d1730892d 100644
--- a/src/fix-ng/Makefile.am
+++ b/src/fix-ng/Makefile.am
@@ -1,12 +1,12 @@
 bin_PROGRAMS = fix-ng
 
 fix_ng_SOURCES = fix-expr.cc parser.cc eval.cc primops.cc fix.cc
-fix_ng_LDADD = ../libmain/libmain.a ../libnix/libnix.a ../libutil/libutil.a \
+fix_ng_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
  ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
  -lsglr -lATB -lconversion -lasfix2 -lmept -lATerm
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libnix -I../libmain
+ -I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain
 
 
 # Parse table generation.
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index edd6685450f0..5d3144ccc7a2 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -7,6 +7,6 @@ AM_CXXFLAGS = \
  -DNIX_DATA_DIR=\"$(datadir)\" \
  -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
- -I.. -I../../externals/inst/include -I../libutil -I../libnix
+ -I.. -I../../externals/inst/include -I../libutil -I../libstore
 
 EXTRA_DIST = *.hh
diff --git a/src/libnix/Makefile.am b/src/libstore/Makefile.am
index 055ef1af7b96..472b1b079313 100644
--- a/src/libnix/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libnix.a
+noinst_LIBRARIES = libstore.a
 
-libnix_a_SOURCES = \
+libstore_a_SOURCES = \
  store.cc expr.cc normalise.cc exec.cc \
  globals.cc db.cc references.cc pathlocks.cc
 
@@ -12,6 +12,6 @@ EXTRA_DIST = *.hh *.h test-builder-*.sh
 check_PROGRAMS = test-aterm
 
 test_aterm_SOURCES = test-aterm.cc
-test_aterm_LDADD = libnix.a $(LDADD) ../boost/format/libformat.a \
+test_aterm_LDADD = libstore.a $(LDADD) ../boost/format/libformat.a \
  -L../../externals/inst/lib -ldb_cxx -lATerm
 
diff --git a/src/libnix/db.cc b/src/libstore/db.cc
index 63ec2724fcb3..63ec2724fcb3 100644
--- a/src/libnix/db.cc
+++ b/src/libstore/db.cc
diff --git a/src/libnix/db.hh b/src/libstore/db.hh
index 1c681b9b5419..1c681b9b5419 100644
--- a/src/libnix/db.hh
+++ b/src/libstore/db.hh
diff --git a/src/libnix/exec.cc b/src/libstore/exec.cc
index 47a385f147d5..47a385f147d5 100644
--- a/src/libnix/exec.cc
+++ b/src/libstore/exec.cc
diff --git a/src/libnix/exec.hh b/src/libstore/exec.hh
index fc5bd6ac8d0b..fc5bd6ac8d0b 100644
--- a/src/libnix/exec.hh
+++ b/src/libstore/exec.hh
diff --git a/src/libnix/expr.cc b/src/libstore/expr.cc
index 7bb1f5306129..7bb1f5306129 100644
--- a/src/libnix/expr.cc
+++ b/src/libstore/expr.cc
diff --git a/src/libnix/expr.hh b/src/libstore/expr.hh
index f5abf9af0d3a..f5abf9af0d3a 100644
--- a/src/libnix/expr.hh
+++ b/src/libstore/expr.hh
diff --git a/src/libnix/globals.cc b/src/libstore/globals.cc
index a292b49aeae0..a292b49aeae0 100644
--- a/src/libnix/globals.cc
+++ b/src/libstore/globals.cc
diff --git a/src/libnix/globals.hh b/src/libstore/globals.hh
index 1b4d0bde3ffe..1b4d0bde3ffe 100644
--- a/src/libnix/globals.hh
+++ b/src/libstore/globals.hh
diff --git a/src/libnix/normalise.cc b/src/libstore/normalise.cc
index cb2bf4f5b183..cb2bf4f5b183 100644
--- a/src/libnix/normalise.cc
+++ b/src/libstore/normalise.cc
diff --git a/src/libnix/normalise.hh b/src/libstore/normalise.hh
index bbe846404cc0..bbe846404cc0 100644
--- a/src/libnix/normalise.hh
+++ b/src/libstore/normalise.hh
diff --git a/src/libnix/pathlocks.cc b/src/libstore/pathlocks.cc
index 3ecbbbcbafd5..3ecbbbcbafd5 100644
--- a/src/libnix/pathlocks.cc
+++ b/src/libstore/pathlocks.cc
diff --git a/src/libnix/pathlocks.hh b/src/libstore/pathlocks.hh
index ce61386d6df0..ce61386d6df0 100644
--- a/src/libnix/pathlocks.hh
+++ b/src/libstore/pathlocks.hh
diff --git a/src/libnix/references.cc b/src/libstore/references.cc
index ab743f76d2d3..ab743f76d2d3 100644
--- a/src/libnix/references.cc
+++ b/src/libstore/references.cc
diff --git a/src/libnix/references.hh b/src/libstore/references.hh
index ada23a883302..ada23a883302 100644
--- a/src/libnix/references.hh
+++ b/src/libstore/references.hh
diff --git a/src/libnix/store.cc b/src/libstore/store.cc
index c83316cf6ad5..c83316cf6ad5 100644
--- a/src/libnix/store.cc
+++ b/src/libstore/store.cc
diff --git a/src/libnix/store.hh b/src/libstore/store.hh
index dab3d603f802..dab3d603f802 100644
--- a/src/libnix/store.hh
+++ b/src/libstore/store.hh
diff --git a/src/libnix/test-builder-1.sh b/src/libstore/test-builder-1.sh
index 80e23354c3b9..80e23354c3b9 100755
--- a/src/libnix/test-builder-1.sh
+++ b/src/libstore/test-builder-1.sh
diff --git a/src/libnix/test-builder-2.sh b/src/libstore/test-builder-2.sh
index 0794fa96a401..0794fa96a401 100755
--- a/src/libnix/test-builder-2.sh
+++ b/src/libstore/test-builder-2.sh
diff --git a/src/libnix/test.cc b/src/libstore/test.cc
index 457fecf245f0..457fecf245f0 100644
--- a/src/libnix/test.cc
+++ b/src/libstore/test.cc
diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am
index 7377a62e7c29..8609cb216453 100644
--- a/src/nix-hash/Makefile.am
+++ b/src/nix-hash/Makefile.am
@@ -1,8 +1,8 @@
 bin_PROGRAMS = nix-hash
 
 nix_hash_SOURCES = nix-hash.cc
-nix_hash_LDADD = ../libmain/libmain.a ../libnix/libnix.a ../libutil/libutil.a \
+nix_hash_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
  ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libnix -I../libmain
+ -I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain
diff --git a/src/nix/Makefile.am b/src/nix/Makefile.am
index c4368a37c6dd..8a52be364f1a 100644
--- a/src/nix/Makefile.am
+++ b/src/nix/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = nix
 
 nix_SOURCES = nix.cc dotgraph.cc
-nix_LDADD = ../libmain/libmain.a ../libnix/libnix.a ../libutil/libutil.a \
+nix_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
  ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
 
 nix.o: nix-help.txt.hh
@@ -12,7 +12,7 @@ nix.o: nix-help.txt.hh
 	echo '"' >> $@
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libnix -I../libmain
+ -I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain
 
 install-data-local:
 	$(INSTALL) -d $(localstatedir)/nix