X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile.am;h=8e25fd966769a3cffc7313babb8d3dfb16e04818;hp=938027c0c6ec20a36f9ebdad85783cc0c3bd2293;hb=7be759d1adf95b168f09e513232ea26de15e1eaf;hpb=e1c0b55cbcc602bdff8b9778d911c35515f48cc3

diff --git a/Makefile.am b/Makefile.am
index 938027c..8e25fd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,16 @@
-ACLOCAL_AMFLAGS=-I config
+ACLOCAL_AMFLAGS=-I m4
 
-INCLUDES = -I$(top_builddir)/urcu
+AM_CPPFLAGS = -I$(top_builddir)/urcu
 
 #Add the -version-info directly here since we are only building
 # library that use the version-info
 AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION)
-if !TARGET_IS_ANDROID
+if !LIBC_INCLUDES_PTHREAD
 AM_LDFLAGS+=-lpthread
 endif
+if USE_CYGWIN
+AM_LDFLAGS+=-no-undefined
+endif
 AM_CFLAGS=-Wall
 
 SUBDIRS = . doc tests
@@ -24,10 +27,10 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
 		$(top_srcdir)/urcu/map/*.h \
 		$(top_srcdir)/urcu/static/*.h \
 		urcu/rand-compat.h \
-		urcu/tls-compat.h
+		urcu/tls-compat.h urcu/debug.h
 nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
 
-dist_noinst_HEADERS = urcu-die.h urcu-wait.h
+dist_noinst_HEADERS = urcu-die.h urcu-wait.h compat-getcpu.h
 
 EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \
 		gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \
@@ -41,9 +44,7 @@ else
 COMPAT=
 endif
 
-if COMPAT_FUTEX
 COMPAT+=compat_futex.c
-endif
 
 RCULFHASH = rculfhash.c rculfhash-mm-order.c rculfhash-mm-chunk.c \
 		rculfhash-mm-mmap.c
@@ -84,12 +85,14 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
 	liburcu-signal.pc liburcu-mb.pc
 
-dist_doc_DATA = README ChangeLog
+dist_doc_DATA = README.md ChangeLog
 
 dist_noinst_DATA = CodingStyle
 
-.PHONY: bench regtest
-bench:
-	cd tests && $(MAKE) $(AM_MAKEFLAGS) bench
+.PHONY: short_bench long_bench regtest
+short_bench:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) short_bench
+long_bench:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) long_bench
 regtest:
 	cd tests && $(MAKE) $(AM_MAKEFLAGS) regtest