wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

* When using the included sqlite/aterm libraries, build with

Browse source 
--enable-shared.
* In libutil/libstore/libexpr etc., link against sqlite and aterm.
* Some more header file hygiene.
This commit is contained in:
Eelco Dolstra 2010-03-02 15:58:13 +00:00
parent 966ffb29a7
commit 594eaddd11
21 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/Makefile.am
View file

@ -3,7 +3,7 @@ pkglib_LTLIBRARIES = libutil.la
libutil_la_SOURCES = util.cc hash.cc serialise.cc \
archive.cc aterm.cc aterm-map.cc xml-writer.cc
libutil_la_LIBADD = ../boost/format/libformat.la
libutil_la_LIBADD = ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
pkginclude_HEADERS = util.hh hash.hh serialise.hh \
archive.hh aterm.hh aterm-map.hh xml-writer.hh types.hh

3
src/libutil/aterm-map.hh
View file

@ -1,7 +1,8 @@
#ifndef __ATERM_MAP_H
#define __ATERM_MAP_H
#include <aterm1.h>
typedef union _ATerm * ATerm;
#include <assert.h>