summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivmai <ivmai>2011-05-10 07:40:52 +0000
committerIvan Maidanski <ivmai@mail.ru>2011-07-25 16:03:26 +0400
commit87f8fdf162ede4c5fd7fd506db659fcb9f6d7c9a (patch)
treee4324d9f6935e2f2c8782ed36b92fd3d03916e89
parent3dcabdd2a0b504b0260c294dba23a8880185472b (diff)
downloadlibatomic_ops-87f8fdf162ede4c5fd7fd506db659fcb9f6d7c9a.tar.gz
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.
-rw-r--r--ChangeLog9
-rw-r--r--tests/Makefile.am18
-rw-r--r--tests/Makefile.in18
3 files changed, 27 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 554b51e..6323c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
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
unless undefined.
* tests/test_stack.c: Expand all tabs to spaces.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0f186cc..6d4ecfc 100644
--- 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 f01de07..0e6de31 100644
--- 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