Port: Fixes to build system for portability

[urcu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ce70dc9f7c9bc6224469e6022e9421a9f27fec9b..f41e3358ad1c4b788e14685a32216f3b60428be5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS=-I config
+ACLOCAL_AMFLAGS=-I m4
 
 AM_CPPFLAGS = -I$(top_builddir)/urcu
 
@@ -41,9 +41,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
@@ -88,8 +86,10 @@ 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