2011-05-10 Ivan Maidanski <ivmai@mail.ru>

	* tests/Makefile.am (EXTRA_DIST): Add list_atomic.c; update
	comment.
	* tests/Makefile.am (CLEANFILES): Remove test_atomic_include.h,
	list_atomic.c.
	* tests/Makefile.am: Remove trailing spaces at EOLn.
	* tests/Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 554b51ea1c97545c74ddc8dabf48d98d4ffc8288..6323c0d710304d70769c0718a94fc095e0cf2c8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-10  Ivan Maidanski  <ivmai@mail.ru>
+
+       * tests/Makefile.am (EXTRA_DIST): Add list_atomic.c; update
+       comment.
+       * tests/Makefile.am (CLEANFILES): Remove test_atomic_include.h,
+       list_atomic.c.
+       * tests/Makefile.am: Remove trailing spaces at EOLn.
+       * tests/Makefile.in: Regenerate.
+
 2011-05-10  Ivan Maidanski  <ivmai@mail.ru>
 
        * tests/test_stack.c (MAX_NTHREADS, N_EXPERIMENTS): Do not define

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0f186cc7cf25ed4845ac8860b0dacdc7d2946a39..6d4ecfcd032e1a05767c9bc3733d18a9f8089876 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,10 @@
 EXTRA_DIST=test_atomic.template list_atomic.template run_parallel.inc \
-          test_atomic_include.h
-# We distribute test_atomic_include.h, since it's hard to regenerate
-# on Windows without sed.
+          test_atomic_include.h list_atomic.c
+# We distribute test_atomic_include.h and list_atomic.c, since it is hard
+# to regenerate them on Windows without sed.
 
 BUILT_SOURCES = test_atomic_include.h list_atomic.i
-CLEANFILES = test_atomic_include.h list_atomic.c list_atomic.i
+CLEANFILES = list_atomic.i
 
 AM_CPPFLAGS=-I$(srcdir)/../src
 
@@ -16,15 +16,15 @@ check_PROGRAMS=test_atomic test_atomic_pthreads test_stack test_malloc
 test_atomic_SOURCES=test_atomic.c
 test_atomic_LDADD=-lpthread ../src/libatomic_ops.a
 
-test_atomic_pthreads_SOURCES=test_atomic.c 
+test_atomic_pthreads_SOURCES=test_atomic.c
 test_atomic_pthreads_CPPFLAGS=-DAO_USE_PTHREAD_DEFS $(AM_CPPFLAGS)
 test_atomic_pthreads_LDADD=-lpthread ../src/libatomic_ops.a
 
-test_stack_SOURCES=test_stack.c 
-test_stack_LDADD=-lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a 
+test_stack_SOURCES=test_stack.c
+test_stack_LDADD=-lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a
 
-test_malloc_SOURCES=test_malloc.c 
-test_malloc_LDADD=-lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a 
+test_malloc_SOURCES=test_malloc.c
+test_malloc_LDADD=-lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a
 
 test_atomic_include.h: test_atomic.template
        sed -e s/XX// $? > $@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f01de0759408aa430d33b052b4b2da90563961df..0e6de3166dee81f59c6c56cdf5982aeb18259127 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -184,22 +184,22 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = test_atomic.template list_atomic.template run_parallel.inc \
-          test_atomic_include.h
+          test_atomic_include.h list_atomic.c
 
-# We distribute test_atomic_include.h, since it's hard to regenerate
-# on Windows without sed.
+# We distribute test_atomic_include.h and list_atomic.c, since it is hard
+# to regenerate them on Windows without sed.
 BUILT_SOURCES = test_atomic_include.h list_atomic.i
-CLEANFILES = test_atomic_include.h list_atomic.c list_atomic.i
+CLEANFILES = list_atomic.i
 AM_CPPFLAGS = -I$(srcdir)/../src
 test_atomic_SOURCES = test_atomic.c
 test_atomic_LDADD = -lpthread ../src/libatomic_ops.a
-test_atomic_pthreads_SOURCES = test_atomic.c 
+test_atomic_pthreads_SOURCES = test_atomic.c
 test_atomic_pthreads_CPPFLAGS = -DAO_USE_PTHREAD_DEFS $(AM_CPPFLAGS)
 test_atomic_pthreads_LDADD = -lpthread ../src/libatomic_ops.a
-test_stack_SOURCES = test_stack.c 
-test_stack_LDADD = -lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a 
-test_malloc_SOURCES = test_malloc.c 
-test_malloc_LDADD = -lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a 
+test_stack_SOURCES = test_stack.c
+test_stack_LDADD = -lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a
+test_malloc_SOURCES = test_malloc.c
+test_malloc_LDADD = -lpthread ../src/libatomic_ops_gpl.a ../src/libatomic_ops.a
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am