list: new -> _new for c++ compatibility

[urcu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f7d64f67bdf10caf37910ff5be957872dbceb88b..33c7b538b773c536c030931a70ad571d4aba8cfd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
-ACLOCAL_AMFLAGS = -I m4
 INCLUDES = -I$(top_builddir)/urcu
 
 AM_LDFLAGS=-lpthread
 
-SUBDIRS = tests
+SUBDIRS = . tests
 
 include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h
-nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h urcu/rculist.h urcu/system.h
-nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h
+nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
+               urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/urcu-futex.h
+nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h urcu/config.h
 
 EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \
                gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \
@@ -19,28 +19,34 @@ else
 COMPAT=
 endif
 
+if COMPAT_FUTEX
+COMPAT+=compat_futex.c
+endif
 
-lib_LTLIBRARIES = liburcu.la liburcu-mb.la liburcu-defer.la liburcu-qsbr.la liburcu-bp.la
+lib_LTLIBRARIES = liburcu.la liburcu-qsbr.la liburcu-mb.la liburcu-signal.la liburcu-bp.la liburcu-defer.la
 
 liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
 
+liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
+
 liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_mb_la_CFLAGS = -DURCU_MB
+liburcu_mb_la_CFLAGS = -DRCU_MB
+
+liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
+liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
 
 liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
 
 liburcu_defer_la_SOURCES = urcu-defer.c $(COMPAT)
 
-liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
-
-*.h *.c: urcu/arch.h urcu/uatomic_arch.h
+$(top_srcdir)/*.h $(top_srcdir)/*.c: urcu/arch.h urcu/uatomic_arch.h
 
 urcu/arch.h: $(top_srcdir)/urcu/arch_@ARCHTYPE@.h
-       $(MKDIR_P) $(top_builddir)/urcu
+       $(mkdir_p) $(top_builddir)/urcu
        cp -f $(top_srcdir)/urcu/arch_@ARCHTYPE@.h $(top_builddir)/urcu/arch.h
 
 urcu/uatomic_arch.h: $(top_srcdir)/urcu/uatomic_arch_@ARCHTYPE@.h
-       $(MKDIR_P) $(top_builddir)/urcu
+       $(mkdir_p) $(top_builddir)/urcu
        cp -f $(top_srcdir)/urcu/uatomic_arch_@ARCHTYPE@.h $(top_builddir)/urcu/uatomic_arch.h
 
 clean-local: