From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 9 Jan 2012 23:12:13 +0000 (-0500)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~1
X-Git-Url: https://git.lttng.org/?p=urcu.git;a=commitdiff_plain;h=f8fc437722856fefd5d415405d5ce8d79e8b6e96;hp=-c

Merge branch 'master' into urcu/ht-shrink
---

f8fc437722856fefd5d415405d5ce8d79e8b6e96
diff --combined Makefile.am
index e1bf095,a14029b..3cfa0ef
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,3 -1,5 +1,5 @@@
+ ACLOCAL_AMFLAGS=-I config
+ 
  INCLUDES = -I$(top_builddir)/urcu
  
  #Add the -version-info directly here since we are only building
@@@ -8,21 -10,19 +10,21 @@@ AM_CFLAGS=-Wal
  SUBDIRS = . tests
  
  include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
 -		urcu-pointer.h urcu-qsbr.h
 +		urcu-pointer.h urcu-qsbr.h urcu-flavor.h
  nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
  		urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/futex.h \
  		urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \
  		urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \
  		urcu/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.h \
 -		urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h
 +		urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h \
 +		urcu/rculfhash.h
  nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
  
  EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \
  		gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \
  		README LICENSE compat_arch_x86.c \
  		urcu-call-rcu-impl.h urcu-defer-impl.h \
 +		rculfhash-internal.h \
  		ChangeLog API.txt \
  		$(top_srcdir)/tests/*.sh
  
@@@ -36,9 -36,6 +38,9 @@@ if COMPAT_FUTE
  COMPAT+=compat_futex.c
  endif
  
 +RCULFHASH = rculfhash.c rculfhash-mm-order.c rculfhash-mm-chunk.c \
 +		rculfhash-mm-mmap.c
 +
  lib_LTLIBRARIES = liburcu-common.la \
  		liburcu.la liburcu-qsbr.la \
  		liburcu-mb.la liburcu-signal.la liburcu-bp.la \
@@@ -67,7 -64,7 +69,7 @@@ liburcu_signal_la_LIBADD = liburcu-comm
  liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
  liburcu_bp_la_LIBADD = liburcu-common.la
  
 -liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
 +liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(RCULFHASH) $(COMPAT)
  liburcu_cds_la_LIBADD = liburcu-common.la
  
  pkgconfigdir = $(libdir)/pkgconfig