From 0cc154431c66aadf445511b7ab29df2266285187 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 9 Oct 2009 10:53:58 -0400 Subject: [PATCH] Update Makefile.am - remove aclocal -I m4 - fix api.h dependency Signed-off-by: Mathieu Desnoyers --- Makefile.am | 1 - tests/Makefile.am | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index e485834..13e9ee5 100644 --- 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 a4c30ff..1cbaada 100644 --- 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 -- 2.34.1