Add AC_CONFIG_MACRO_DIR([m4]), re-add ACLOCAL_AMFLAGS

[urcu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 28e414c3c186fffcec498c216ae17ecaaaae50d8..3dac293e0fa3db61df289878249363bc9c146d35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
-ACLOCAL_AMFLAGS = -I m4
+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 \
@@ -37,7 +37,7 @@ 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