HOTFIX: Add and adjust include directories.

(Apply commit 13b518f)

* src/Makefile.am, tests/Makefile.am: Set compiler include paths
to $(top_builddir)/src and $(top_srcdir)/src.
* src/Makefile.in: Regenerate.
* tests/Makefile.in: Ditto.

diff --git a/ChangeLog b/ChangeLog
index f40f3296c95e2e68c0b18fc67e9d01c6d51c2f60..57e6dc27dc7b76c427b842d4b180c8b64e28535c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-10  Ivan Maidanski <ivmai@mail.ru> (really Petter Urkedal)
+
+       * src/Makefile.am, tests/Makefile.am: Set compiler include paths
+       to $(top_builddir)/src and $(top_srcdir)/src.
+       * src/Makefile.in: Regenerate.
+       * tests/Makefile.in: Ditto.
+
 2011-07-14  Ivan Maidanski <ivmai@mail.ru>
 
        * tests/list_atomic.template (list_atomicXX): Remove "addr" local

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ca41ff1161381dd4080a345d86ee9eaa1602d6e..91da77a0f8a221bab8863d8686a3461a3a04bc27 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS=atomic_ops
 
 AM_CFLAGS=@PICFLAG@
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
 
 include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
 lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a

diff --git a/src/Makefile.in b/src/Makefile.in
index ff309fe04eaae4bd284c795f136b5d9fc31b6daa..9fe367b4c4c0d25e93ff70d75cd1c05ee7bc14a7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -245,6 +245,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = atomic_ops
 AM_CFLAGS = @PICFLAG@
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
 include_HEADERS = atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
 lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a
 @NEED_ASM_FALSE@libatomic_ops_a_SOURCES = atomic_ops.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5afb35d4b981c1bc098f5b9a9ccc0df4a01fc37..f23a9b6cd258df9fbba09467a6a3a8d92a5df884 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST=test_atomic.template list_atomic.template run_parallel.inc \
 BUILT_SOURCES = test_atomic_include.h list_atomic.i
 CLEANFILES = list_atomic.i
 
-AM_CPPFLAGS=-I$(srcdir)/../src
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
 
 TESTS=test_atomic test_atomic_pthreads test_stack test_malloc
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 590e64acc0bf58a5525d880487feef9b4c14d32f..481f4f417a03791436ab67b326f63b2bcc9496d0 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -194,7 +194,7 @@ EXTRA_DIST = test_atomic.template list_atomic.template run_parallel.inc \
 # to regenerate them on Windows without sed.
 BUILT_SOURCES = test_atomic_include.h list_atomic.i
 CLEANFILES = list_atomic.i
-AM_CPPFLAGS = -I$(srcdir)/../src
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
 test_atomic_SOURCES = test_atomic.c
 test_atomic_LDADD = $(THREADDLLIBS) ../src/libatomic_ops.a
 test_atomic_pthreads_SOURCES = test_atomic.c