max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-12-01 18:16:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* libnix -> libstore.

Browse source
This commit is contained in:
Eelco Dolstra 2003-11-18 10:55:27 +00:00
parent 8798fae304
commit 9f0f020929
26 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -29,7 +29,7 @@ AC_CONFIG_FILES([Makefile
src/boost/Makefile src/boost/Makefile
src/boost/format/Makefile src/boost/format/Makefile
src/libutil/Makefile src/libutil/Makefile
src/libnix/Makefile src/libstore/Makefile
src/libmain/Makefile src/libmain/Makefile
src/nix/Makefile src/nix/Makefile
src/nix-hash/Makefile src/nix-hash/Makefile

2
src/Makefile.am
View file

@ -1 +1 @@
SUBDIRS = boost libutil libnix libmain nix nix-hash fix-ng SUBDIRS = boost libutil libstore libmain nix nix-hash fix-ng

4
src/fix-ng/Makefile.am
View file

@ -1,12 +1,12 @@
bin_PROGRAMS = fix-ng bin_PROGRAMS = fix-ng
fix_ng_SOURCES = fix-expr.cc parser.cc eval.cc primops.cc fix.cc 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 \ ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
-lsglr -lATB -lconversion -lasfix2 -lmept -lATerm -lsglr -lATB -lconversion -lasfix2 -lmept -lATerm
AM_CXXFLAGS = \ 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. # Parse table generation.

2
src/libmain/Makefile.am
View file

@ -7,6 +7,6 @@ AM_CXXFLAGS = \
-DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/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 EXTRA_DIST = *.hh

6
src/libnix/Makefile.am → src/libstore/Makefile.am
View file

@ -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 \ store.cc expr.cc normalise.cc exec.cc \
globals.cc db.cc references.cc pathlocks.cc globals.cc db.cc references.cc pathlocks.cc
@ -12,6 +12,6 @@ EXTRA_DIST = *.hh *.h test-builder-*.sh
check_PROGRAMS = test-aterm check_PROGRAMS = test-aterm
test_aterm_SOURCES = test-aterm.cc 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 -L../../externals/inst/lib -ldb_cxx -lATerm

0
src/libnix/db.cc → src/libstore/db.cc
View file

0
src/libnix/db.hh → src/libstore/db.hh
View file

0
src/libnix/exec.cc → src/libstore/exec.cc
View file

0
src/libnix/exec.hh → src/libstore/exec.hh
View file

0
src/libnix/expr.cc → src/libstore/expr.cc
View file

0
src/libnix/expr.hh → src/libstore/expr.hh
View file

0
src/libnix/globals.cc → src/libstore/globals.cc
View file

0
src/libnix/globals.hh → src/libstore/globals.hh
View file

0
src/libnix/normalise.cc → src/libstore/normalise.cc
View file

0
src/libnix/normalise.hh → src/libstore/normalise.hh
View file

0
src/libnix/pathlocks.cc → src/libstore/pathlocks.cc
View file

0
src/libnix/pathlocks.hh → src/libstore/pathlocks.hh
View file

0
src/libnix/references.cc → src/libstore/references.cc
View file

0
src/libnix/references.hh → src/libstore/references.hh
View file

0
src/libnix/store.cc → src/libstore/store.cc
View file

0
src/libnix/store.hh → src/libstore/store.hh
View file

0
src/libnix/test-builder-1.sh → src/libstore/test-builder-1.sh
View file

0
src/libnix/test-builder-2.sh → src/libstore/test-builder-2.sh
View file

0
src/libnix/test.cc → src/libstore/test.cc
View file

4
src/nix-hash/Makefile.am
View file

@ -1,8 +1,8 @@
bin_PROGRAMS = nix-hash bin_PROGRAMS = nix-hash
nix_hash_SOURCES = nix-hash.cc 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 ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libnix -I../libmain -I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain

4
src/nix/Makefile.am
View file

@ -1,7 +1,7 @@
bin_PROGRAMS = nix bin_PROGRAMS = nix
nix_SOURCES = nix.cc dotgraph.cc 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 ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
nix.o: nix-help.txt.hh nix.o: nix-help.txt.hh
@ -12,7 +12,7 @@ nix.o: nix-help.txt.hh
echo '"' >> $@ echo '"' >> $@
AM_CXXFLAGS = \ 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-data-local:
$(INSTALL) -d $(localstatedir)/nix $(INSTALL) -d $(localstatedir)/nix