about summary refs log tree commit diff
path: root/src/libstore/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-03-02T15·58+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-03-02T15·58+0000
commit594eaddd1157db8abe2e1c47cdf2180f027559ad (patch)
tree3dd95f89c19098f9b20a085a04917217602fbb6c /src/libstore/Makefile.am
parent966ffb29a7a7de00f3521da05f325ae8c7e8e35e (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/libstore/Makefile.am')
-rw-r--r--src/libstore/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index dbfc1474e812..dd6760554a72 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -10,14 +10,14 @@ pkginclude_HEADERS = \
   globals.hh references.hh pathlocks.hh \
   worker-protocol.hh
 
-libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la
+libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
 
 BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
 
 EXTRA_DIST = derivations-ast.def derivations-ast.cc schema.sql
 
 AM_CXXFLAGS = -Wall \
- -I$(srcdir)/.. ${aterm_include} ${sqlite_include} -I$(srcdir)/../libutil
+ -I$(srcdir)/.. ${aterm_include} ${sqlite_include} -I$(srcdir)/../libutil -I${top_srcdir}/externals/sqlite-3.6.22/
 
 local-store.lo: schema.sql.hh