X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=5901732dac36492d3c9d88f503abd4cea9100d48;hb=refs%2Fheads%2Fstable-0.8;hp=30a44ce66ab9f788f81f393f90ca0e905e0b31ac;hpb=49c33f30dc00948a63fb00f92d80dc4aa8e30486;p=urcu.git

diff --git a/Makefile.am b/Makefile.am
index 30a44ce..5901732 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_builddir)/urcu
 #Add the -version-info directly here since we are only building
 # library that use the version-info
 AM_LDFLAGS=-lpthread -version-info $(URCU_LIBRARY_VERSION)
-AM_CFLAGS=-Wall
+AM_CFLAGS+=-Wall
 
 SUBDIRS = . doc tests
 
@@ -37,9 +37,7 @@ else
 COMPAT=
 endif
 
-if COMPAT_FUTEX
 COMPAT+=compat_futex.c
-endif
 
 RCULFHASH = rculfhash.c rculfhash-mm-order.c rculfhash-mm-chunk.c \
 		rculfhash-mm-mmap.c
@@ -62,11 +60,11 @@ liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
 liburcu_qsbr_la_LIBADD = liburcu-common.la
 
 liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_mb_la_CFLAGS = -DRCU_MB
+liburcu_mb_la_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 liburcu_mb_la_LIBADD = liburcu-common.la
 
 liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
+liburcu_signal_la_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
 liburcu_signal_la_LIBADD = liburcu-common.la
 
 liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)