From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 28 Jun 2016 14:50:18 +0000 (-0400)
Subject: Fix: Do not use wildcards in include/Makefile.am
X-Git-Tag: v0.10.0~22
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=28d543c559dfb2923b515f67fb3318fcbefe5fb8;p=userspace-rcu.git

Fix: Do not use wildcards in include/Makefile.am

Wildcards are not officially supported by autotools
in Makefiles since it needs to know the exact list
of files it has to work with.

Using an absolute path was a hack that worked as long
as the path to the header files from the top source dir
was the same as the install path of those files, which
is not the case anymore.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/Makefile.am b/include/Makefile.am
index 2792f99..0dd5deb 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -5,12 +5,44 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
 		urcu/ref.h urcu/cds.h urcu/urcu_ref.h urcu/urcu-futex.h \
 		urcu/uatomic_arch.h urcu/rculfhash.h urcu/wfcqueue.h \
 		urcu/lfstack.h urcu/syscall-compat.h \
-		$(top_srcdir)/include/urcu/map/*.h \
-		$(top_srcdir)/include/urcu/static/*.h \
+		urcu/map/urcu-bp.h urcu/map/urcu.h urcu/map/urcu-qsbr.h \
+		urcu/static/lfstack.h urcu/static/rculfqueue.h \
+		urcu/static/rculfstack.h urcu/static/urcu-bp.h \
+		urcu/static/urcu.h urcu/static/urcu-pointer.h \
+		urcu/static/urcu-qsbr.h urcu/static/wfcqueue.h \
+		urcu/static/wfqueue.h urcu/static/wfstack.h \
 		urcu/tls-compat.h urcu/debug.h
 
 # Don't distribute generated headers
 nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
 
-EXTRA_DIST = $(top_srcdir)/include/urcu/arch/*.h \
-	$(top_srcdir)/include/urcu/uatomic/*.h
+EXTRA_DIST = urcu/arch/aarch64.h \
+	urcu/arch/alpha.h \
+	urcu/arch/arm.h \
+	urcu/arch/gcc.h \
+	urcu/arch/generic.h \
+	urcu/arch/hppa.h \
+	urcu/arch/ia64.h \
+	urcu/arch/mips.h \
+	urcu/arch/nios2.h \
+	urcu/arch/ppc.h \
+	urcu/arch/s390.h \
+	urcu/arch/sparc64.h \
+	urcu/arch/tile.h \
+	urcu/arch/unknown.h \
+	urcu/arch/x86.h \
+	urcu/uatomic/aarch64.h \
+	urcu/uatomic/alpha.h \
+	urcu/uatomic/arm.h \
+	urcu/uatomic/gcc.h \
+	urcu/uatomic/generic.h \
+	urcu/uatomic/hppa.h \
+	urcu/uatomic/ia64.h \
+	urcu/uatomic/mips.h \
+	urcu/uatomic/nios2.h \
+	urcu/uatomic/ppc.h \
+	urcu/uatomic/s390.h \
+	urcu/uatomic/sparc64.h \
+	urcu/uatomic/tile.h \
+	urcu/uatomic/unknown.h
+	urcu/uatomic/x86.h