From 9f0f020929c9e093405cc6193d2f227cab763912 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Nov 2003 10:55:27 +0000 Subject: [PATCH] * libnix -> libstore. --- configure.ac | 2 +- src/Makefile.am | 2 +- src/fix-ng/Makefile.am | 4 ++-- src/libmain/Makefile.am | 2 +- src/{libnix => libstore}/Makefile.am | 6 +++--- src/{libnix => libstore}/db.cc | 0 src/{libnix => libstore}/db.hh | 0 src/{libnix => libstore}/exec.cc | 0 src/{libnix => libstore}/exec.hh | 0 src/{libnix => libstore}/expr.cc | 0 src/{libnix => libstore}/expr.hh | 0 src/{libnix => libstore}/globals.cc | 0 src/{libnix => libstore}/globals.hh | 0 src/{libnix => libstore}/normalise.cc | 0 src/{libnix => libstore}/normalise.hh | 0 src/{libnix => libstore}/pathlocks.cc | 0 src/{libnix => libstore}/pathlocks.hh | 0 src/{libnix => libstore}/references.cc | 0 src/{libnix => libstore}/references.hh | 0 src/{libnix => libstore}/store.cc | 0 src/{libnix => libstore}/store.hh | 0 src/{libnix => libstore}/test-builder-1.sh | 0 src/{libnix => libstore}/test-builder-2.sh | 0 src/{libnix => libstore}/test.cc | 0 src/nix-hash/Makefile.am | 4 ++-- src/nix/Makefile.am | 4 ++-- 26 files changed, 12 insertions(+), 12 deletions(-) rename src/{libnix => libstore}/Makefile.am (73%) rename src/{libnix => libstore}/db.cc (100%) rename src/{libnix => libstore}/db.hh (100%) rename src/{libnix => libstore}/exec.cc (100%) rename src/{libnix => libstore}/exec.hh (100%) rename src/{libnix => libstore}/expr.cc (100%) rename src/{libnix => libstore}/expr.hh (100%) rename src/{libnix => libstore}/globals.cc (100%) rename src/{libnix => libstore}/globals.hh (100%) rename src/{libnix => libstore}/normalise.cc (100%) rename src/{libnix => libstore}/normalise.hh (100%) rename src/{libnix => libstore}/pathlocks.cc (100%) rename src/{libnix => libstore}/pathlocks.hh (100%) rename src/{libnix => libstore}/references.cc (100%) rename src/{libnix => libstore}/references.hh (100%) rename src/{libnix => libstore}/store.cc (100%) rename src/{libnix => libstore}/store.hh (100%) rename src/{libnix => libstore}/test-builder-1.sh (100%) rename src/{libnix => libstore}/test-builder-2.sh (100%) rename src/{libnix => libstore}/test.cc (100%) diff --git a/configure.ac b/configure.ac index cc7db29c81..9d4b41b6bd 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 e62c29d7ce..ed989fed20 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 cf85493297..df3d173089 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 edd6685450..5d3144ccc7 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 similarity index 73% rename from src/libnix/Makefile.am rename to src/libstore/Makefile.am index 055ef1af7b..472b1b0793 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 similarity index 100% rename from src/libnix/db.cc rename to src/libstore/db.cc diff --git a/src/libnix/db.hh b/src/libstore/db.hh similarity index 100% rename from src/libnix/db.hh rename to src/libstore/db.hh diff --git a/src/libnix/exec.cc b/src/libstore/exec.cc similarity index 100% rename from src/libnix/exec.cc rename to src/libstore/exec.cc diff --git a/src/libnix/exec.hh b/src/libstore/exec.hh similarity index 100% rename from src/libnix/exec.hh rename to src/libstore/exec.hh diff --git a/src/libnix/expr.cc b/src/libstore/expr.cc similarity index 100% rename from src/libnix/expr.cc rename to src/libstore/expr.cc diff --git a/src/libnix/expr.hh b/src/libstore/expr.hh similarity index 100% rename from src/libnix/expr.hh rename to src/libstore/expr.hh diff --git a/src/libnix/globals.cc b/src/libstore/globals.cc similarity index 100% rename from src/libnix/globals.cc rename to src/libstore/globals.cc diff --git a/src/libnix/globals.hh b/src/libstore/globals.hh similarity index 100% rename from src/libnix/globals.hh rename to src/libstore/globals.hh diff --git a/src/libnix/normalise.cc b/src/libstore/normalise.cc similarity index 100% rename from src/libnix/normalise.cc rename to src/libstore/normalise.cc diff --git a/src/libnix/normalise.hh b/src/libstore/normalise.hh similarity index 100% rename from src/libnix/normalise.hh rename to src/libstore/normalise.hh diff --git a/src/libnix/pathlocks.cc b/src/libstore/pathlocks.cc similarity index 100% rename from src/libnix/pathlocks.cc rename to src/libstore/pathlocks.cc diff --git a/src/libnix/pathlocks.hh b/src/libstore/pathlocks.hh similarity index 100% rename from src/libnix/pathlocks.hh rename to src/libstore/pathlocks.hh diff --git a/src/libnix/references.cc b/src/libstore/references.cc similarity index 100% rename from src/libnix/references.cc rename to src/libstore/references.cc diff --git a/src/libnix/references.hh b/src/libstore/references.hh similarity index 100% rename from src/libnix/references.hh rename to src/libstore/references.hh diff --git a/src/libnix/store.cc b/src/libstore/store.cc similarity index 100% rename from src/libnix/store.cc rename to src/libstore/store.cc diff --git a/src/libnix/store.hh b/src/libstore/store.hh similarity index 100% rename from src/libnix/store.hh rename to src/libstore/store.hh diff --git a/src/libnix/test-builder-1.sh b/src/libstore/test-builder-1.sh similarity index 100% rename from src/libnix/test-builder-1.sh rename to src/libstore/test-builder-1.sh diff --git a/src/libnix/test-builder-2.sh b/src/libstore/test-builder-2.sh similarity index 100% rename from src/libnix/test-builder-2.sh rename to src/libstore/test-builder-2.sh diff --git a/src/libnix/test.cc b/src/libstore/test.cc similarity index 100% rename from src/libnix/test.cc rename to src/libstore/test.cc diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am index 7377a62e7c..8609cb2164 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 c4368a37c6..8a52be364f 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