diff options
| author | Tom Bachmann <e_mc_h2@web.de> | 2008-12-15 22:10:12 +0100 |
|---|---|---|
| committer | Tom Bachmann <e_mc_h2@web.de> | 2008-12-15 22:10:12 +0100 |
| commit | 561aeff59eac9010fbea31dcdb0c3c56f6d7c8f2 (patch) | |
| tree | c7d97c80b28fe30a5d9dcb43f80c7a961f56a3d8 /libhurd-slab | |
| parent | 26bcde4109a940375706a4cf6cd6d4700707378f (diff) | |
| parent | 75d938974b595144f0435711c3f41e51127b32f9 (diff) | |
Merge commit 'origin/master' into viengoos-x86-64
Conflicts:
ChangeLog
README
configure.ac
doc/ChangeLog
doc/reference-guide.tex
doc/viengoos.tex
gcc/ChangeLog
gcc/Makefrag.am
hurd/stddef.h
libc-parts/assert.h
libhurd-slab/ChangeLog
libl4/ChangeLog
libpthread/ChangeLog
libpthread/sysdeps/generic/bits/spin-lock-inline.h
viengoos/server.c
viengoos/thread.c
viengoos/thread.h
viengoos/viengoos.c
Diffstat (limited to 'libhurd-slab')
| -rw-r--r-- | libhurd-slab/ChangeLog | 5 | ||||
| -rw-r--r-- | libhurd-slab/Makefile.am | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libhurd-slab/ChangeLog b/libhurd-slab/ChangeLog index 44fd9dd..9b7ef45 100644 --- a/libhurd-slab/ChangeLog +++ b/libhurd-slab/ChangeLog @@ -1,3 +1,8 @@ +2008-12-04 Neal H. Walfield <neal@gnu.org> + + * Makefile.am (AM_CPPFLAGS): Set to $(USER_CPPFLAGS). + (AM_CFLAGS): Set to $(USER_CFLAGS). + 2008-11-20 Neal H. Walfield <neal@gnu.org> * slab.h (hurd_slab_constructor_t): Improve documentation. diff --git a/libhurd-slab/Makefile.am b/libhurd-slab/Makefile.am index 3450879..3ec8438 100644 --- a/libhurd-slab/Makefile.am +++ b/libhurd-slab/Makefile.am @@ -26,8 +26,6 @@ endif includehurddir = $(includedir)/hurd includehurd_HEADERS = slab.h -# FIXME: Build a special libhurd-ihash.a using libc-parts for the rootservers, -# and a normal for everybody else. -AM_CPPFLAGS = -I$(LIBC)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/libc-parts +AM_CPPFLAGS = $(USER_CPPFLAGS) +AM_CFLAGS = $(USER_CFLAGS) libhurd_slab_a_SOURCES = slab.h slab.c |