wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

* Allow linking against an external Berkeley DB / ATerm library.

Browse source
This commit is contained in:
Eelco Dolstra 2004-02-16 16:37:16 +00:00
parent f34de12140
commit 0dfdafdf6d
11 changed files with 47 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/Makefile.am
View file

@ -7,9 +7,9 @@ libexpr_a_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \
EXTRA_DIST = lexer.l parser.y
AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libstore
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore
AM_CFLAGS = \
-I../../externals/inst/include
${aterm_include}
# Parser generation.

2
src/libmain/Makefile.am
View file

@ -8,4 +8,4 @@ AM_CXXFLAGS = \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-DNIX_VERSION=\"$(VERSION)\" \
-I.. -I../../externals/inst/include -I../libutil -I../libstore
-I.. ${aterm_include} -I../libutil -I../libstore

2
src/libstore/Makefile.am
View file

@ -7,4 +7,4 @@ libstore_a_SOURCES = \
references.cc references.hh pathlocks.cc pathlocks.hh
AM_CXXFLAGS = -Wall \
-I.. -I../../externals/inst/include -I../libutil
-I.. ${bdb_include} ${aterm_include} -I../libutil

4
src/libutil/Makefile.am
View file

@ -3,11 +3,11 @@ noinst_LIBRARIES = libutil.a
libutil_a_SOURCES = util.cc util.hh hash.cc hash.hh \
archive.cc archive.hh md5.c md5.h aterm.cc aterm.hh
AM_CXXFLAGS = -DSYSTEM=\"@system@\" -Wall -I.. -I../../externals/inst/include
AM_CXXFLAGS = -DSYSTEM=\"@system@\" -Wall -I.. ${aterm_include}
check_PROGRAMS = test-aterm
test_aterm_SOURCES = test-aterm.cc
test_aterm_LDADD = ./libutil.a ../boost/format/libformat.a \
-L../../externals/inst/lib -ldb_cxx -lATerm
${aterm_lib}

5
src/nix-env/Makefile.am
View file

@ -4,8 +4,7 @@ nix_env_SOURCES = main.cc names.cc names.hh \
profiles.cc profiles.hh help.txt
nix_env_LDADD = ../libmain/libmain.a ../libexpr/libexpr.a \
../libstore/libstore.a ../libutil/libutil.a \
../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
-lATerm
../boost/format/libformat.a ${bdb_lib} ${aterm_lib}
main.o: help.txt.hh
@ -13,7 +12,7 @@ main.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libstore \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \
-I../libexpr -I../libmain
install-data-local:

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

@ -2,7 +2,7 @@ bin_PROGRAMS = nix-hash
nix_hash_SOURCES = nix-hash.cc help.txt
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 ${bdb_lib} ${aterm_lib}
nix-hash.o: help.txt.hh

5
src/nix-instantiate/Makefile.am
View file

@ -3,8 +3,7 @@ bin_PROGRAMS = nix-instantiate
nix_instantiate_SOURCES = main.cc help.txt
nix_instantiate_LDADD = ../libmain/libmain.a ../libexpr/libexpr.a \
../libstore/libstore.a ../libutil/libutil.a \
../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
-lATerm
../boost/format/libformat.a ${bdb_lib} ${aterm_lib}
main.o: help.txt.hh
@ -12,5 +11,5 @@ main.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libstore \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \
-I../libexpr -I../libmain

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

@ -2,7 +2,7 @@ bin_PROGRAMS = nix-store
nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt
nix_store_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 ${bdb_lib} ${aterm_lib}
main.o: help.txt.hh
@ -10,7 +10,7 @@ main.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain
-I.. ${bdb_include} $(aterm_include) -I../libutil -I../libstore -I../libmain
init-state-local:
$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix