Update Makefile.am

- remove aclocal -I m4
- fix api.h dependency

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/Makefile.am b/Makefile.am
index e4858340f66514f8298cb16149810437cd59709d..13e9ee5187939da5b4faa18a87b03b6920e11c37 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
 INCLUDES = -I$(top_builddir)/urcu
 
 AM_LDFLAGS=-lpthread

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4c30ff911b36d8158787486a7f8617fbface6e3..1cbaada689a224f884dacf890023a0643ac2e131 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -72,19 +72,19 @@ test_qsbr_timing_SOURCES = test_qsbr_timing.c $(URCU_QSBR)
 
 test_qsbr_SOURCES = test_qsbr.c $(URCU_QSBR)
 
-rcutorture_urcu_SOURCES = api.h urcutorture.c
+rcutorture_urcu_SOURCES = urcutorture.c
 rcutorture_urcu_CFLAGS = -DTORTURE_URCU_SIGNAL $(AM_CFLAGS)
 rcutorture_urcu_LDADD = $(URCU_SIGNAL_LIB)
 
-rcutorture_urcu_mb_SOURCES = api.h urcutorture.c
+rcutorture_urcu_mb_SOURCES = urcutorture.c
 rcutorture_urcu_mb_CFLAGS = -DTORTURE_URCU_MB $(AM_CFLAGS)
 rcutorture_urcu_mb_LDADD = $(URCU_MB_LIB)
 
-rcutorture_qsbr_SOURCES = api.h urcutorture.c
+rcutorture_qsbr_SOURCES = urcutorture.c
 rcutorture_qsbr_CFLAGS = -DTORTURE_QSBR $(AM_CFLAGS)
 rcutorture_qsbr_LDADD = $(URCU_QSBR_LIB)
 
-rcutorture_urcu_bp_SOURCES = api.h urcutorture.c
+rcutorture_urcu_bp_SOURCES = urcutorture.c
 rcutorture_urcu_bp_CFLAGS = -DTORTURE_URCU_BP $(AM_CFLAGS)
 rcutorture_urcu_bp_LDADD = $(URCU_BP_LIB)
 
@@ -126,7 +126,7 @@ test_urcu_bp_SOURCES = test_urcu_bp.c $(URCU_BP)
 test_urcu_bp_dynamic_link_SOURCES = test_urcu_bp.c $(URCU_BP)
 test_urcu_bp_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 
-*.o: api.h
+urcutorture.c: api.h
 
 api.h: $(APIHEADER)
        cp -f $(srcdir)/$(APIHEADER) api.h