diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-03-02T15·58+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-03-02T15·58+0000 |
| commit | 594eaddd1157db8abe2e1c47cdf2180f027559ad (patch) | |
| tree | 3dd95f89c19098f9b20a085a04917217602fbb6c /src/nix-instantiate | |
| parent | 966ffb29a7a7de00f3521da05f325ae8c7e8e35e (diff) | |
* When using the included sqlite/aterm libraries, build with
--enable-shared. * In libutil/libstore/libexpr etc., link against sqlite and aterm. * Some more header file hygiene.
Diffstat (limited to 'src/nix-instantiate')
| -rw-r--r-- | src/nix-instantiate/Makefile.am | 2 | ||||
| -rw-r--r-- | src/nix-instantiate/nix-instantiate.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am index f393318053d8..1c6d30873e25 100644 --- a/src/nix-instantiate/Makefile.am +++ b/src/nix-instantiate/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = nix-instantiate nix_instantiate_SOURCES = nix-instantiate.cc help.txt nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} + ../boost/format/libformat.la nix-instantiate.o: help.txt.hh diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 22df2fbe5db3..d8b39eca2694 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -11,6 +11,7 @@ #include "util.hh" #include "store-api.hh" #include "common-opts.hh" +#include "aterm.hh" #include "help.txt.hh" |