* libnix -> libstore.
This commit is contained in:
parent
8798fae304
commit
9f0f020929
26 changed files with 12 additions and 12 deletions
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
SUBDIRS = boost libutil libnix libmain nix nix-hash fix-ng
|
||||
SUBDIRS = boost libutil libstore libmain nix nix-hash fix-ng
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue