diff options
| author | Neal H. Walfield <neal@gnu.org> | 2009-01-16 20:12:25 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@gnu.org> | 2009-01-16 20:13:09 +0100 |
| commit | 2de1c73d703c75a9f820b1134ca72b3c67f1083c (patch) | |
| tree | 947fcad5051921d671a2bfbc43759303d1ee2e49 /libhurd-btree | |
| parent | 01162d90ca9c87c2afe78e56f723ed0ec0fd8edb (diff) | |
Compile a libhurd-btree compiled with the kernel compile flags.
libhurd-btree/
2009-01-16 Neal H. Walfield <neal@gnu.org>
* Makefile.am (lib_LIBRARIES): Add libhurd-btree-kernel.a.
(libhurd_btree_a_CPPFLAGS): Don't include -DNCHECKS.
(libhurd_btree_kernel_a_CPPFLAGS): New variable.
(libhurd_btree_kernel_a_CFLAGS): Likewise.
(libhurd_btree_kernel_a_SOURCES): Likewise.
viengoos/
2009-01-16 Neal H. Walfield <neal@gnu.org>
* Makefile.am (viengoos_LDADD): Link to
../libhurd-btree/libhurd-btree-kernel.a, not
../libhurd-btree/libhurd-btree.a.
Diffstat (limited to 'libhurd-btree')
| -rw-r--r-- | libhurd-btree/ChangeLog | 8 | ||||
| -rw-r--r-- | libhurd-btree/Makefile.am | 16 |
2 files changed, 20 insertions, 4 deletions
diff --git a/libhurd-btree/ChangeLog b/libhurd-btree/ChangeLog index 1e474f5..8a9a052 100644 --- a/libhurd-btree/ChangeLog +++ b/libhurd-btree/ChangeLog @@ -1,5 +1,13 @@ 2009-01-16 Neal H. Walfield <neal@gnu.org> + * Makefile.am (lib_LIBRARIES): Add libhurd-btree-kernel.a. + (libhurd_btree_a_CPPFLAGS): Don't include -DNCHECKS. + (libhurd_btree_kernel_a_CPPFLAGS): New variable. + (libhurd_btree_kernel_a_CFLAGS): Likewise. + (libhurd_btree_kernel_a_SOURCES): Likewise. + +2009-01-16 Neal H. Walfield <neal@gnu.org> + * btree.h (BTREE_NP): Cast (__BN_NODE_PTR).PTR to a uintptr_t before using it. diff --git a/libhurd-btree/Makefile.am b/libhurd-btree/Makefile.am index 7c4cf64..591e27e 100644 --- a/libhurd-btree/Makefile.am +++ b/libhurd-btree/Makefile.am @@ -19,21 +19,29 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, # USA. */ -lib_LIBRARIES = libhurd-btree.a +lib_LIBRARIES = libhurd-btree.a libhurd-btree-kernel.a includehurddir = $(includedir)/hurd includehurd_HEADERS = btree.h -libhurd_btree_a_CPPFLAGS = -DNCHECKS if ENABLE_TESTS -libhurd_btree_a_CPPFLAGS += $(CHECK_CPPFLAGS) +libhurd_btree_a_CPPFLAGS = $(CHECK_CPPFLAGS) libhurd_btree_a_CFLAGS = $(CHECK_CFLAGS) else -libhurd_btree_a_CPPFLAGS += $(USER_CPPFLAGS) +libhurd_btree_a_CPPFLAGS = $(USER_CPPFLAGS) libhurd_btree_a_CFLAGS = $(USER_CFLAGS) endif libhurd_btree_a_SOURCES = btree.h btree.c +if ENABLE_TESTS +libhurd_btree_kernel_a_CPPFLAGS = $(CHECK_CPPFLAGS) +libhurd_btree_kernel_a_CFLAGS = $(CHECK_CFLAGS) +else +libhurd_btree_kernel_a_CPPFLAGS = $(KERNEL_CPPFLAGS) +libhurd_btree_kernel_a_CFLAGS = $(KERNEL_CFLAGS) +endif +libhurd_btree_kernel_a_SOURCES = btree.h btree.c + TESTS = btree-test t-find-first check_PROGRAMS = btree-test t-find-first |