diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-03-02 15:58:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-03-02 15:58:13 +0000 |
| commit | 594eaddd1157db8abe2e1c47cdf2180f027559ad (patch) | |
| tree | 3dd95f89c19098f9b20a085a04917217602fbb6c /src/libstore | |
| 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/libstore')
| -rw-r--r-- | src/libstore/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libstore/derivations.hh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am index dbfc1474e..dd6760554 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 diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index 042f4738d..c3f579bee 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -1,7 +1,7 @@ #ifndef __DERIVATIONS_H #define __DERIVATIONS_H -#include <aterm1.h> +typedef union _ATerm * ATerm; #include "hash.hh" |