urcu signal-based renames

[urcu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 28e414c3c186fffcec498c216ae17ecaaaae50d8..b2f279f2bda1214c5c0f5c39dc7845f9e688be72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,8 @@
-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 \
@@ -29,7 +28,7 @@ lib_LTLIBRARIES = liburcu.la liburcu-mb.la liburcu-defer.la liburcu-qsbr.la libu
 liburcu_la_SOURCES = urcu.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_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
 
@@ -37,14 +36,14 @@ 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: