validation: use convenience libs rather than static libs

Convert libraries used under test/validation to libtool convenience
libraries (.la files) rather than regular static libraries. These are used
elsewhere in the tree and allow for dependencies to be tracked
automatically.

Change-Id: I1dba179ce9151d277bd311f4c5430f85ecfe4b4f
Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org>
Reviewed-by: Christophe Milard <christophe.milard@linaro.org>

40 files changed, 66 insertions, 83 deletions

diff --git a/.gitignore b/.gitignore
index 9fc0facf0..e4d729762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.d
 *.gcda
 *.gcno
+*.la
 *.lo
 *.o
 *.orig
diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc
index 31729b88d..cacdfe140 100644
--- a/test/validation/Makefile.inc
+++ b/test/validation/Makefile.inc
@@ -1,7 +1,9 @@
 include $(top_srcdir)/test/Makefile.inc
 
+COMMON_DIR = $(top_srcdir)/test/validation/common
+
 AM_CFLAGS += -I$(top_srcdir)/test/validation/common
 AM_LDFLAGS += -static
 
-LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.a
+LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
 LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp.la
diff --git a/test/validation/buffer/.gitignore b/test/validation/buffer/.gitignore
index 01a6b36e8..0e8ac15c1 100644
--- a/test/validation/buffer/.gitignore
+++ b/test/validation/buffer/.gitignore
@@ -1,2 +1 @@
 buffer_main
-libbuffer.a
diff --git a/test/validation/buffer/Makefile.am b/test/validation/buffer/Makefile.am
index 80602409b..e1b1233cd 100644
--- a/test/validation/buffer/Makefile.am
+++ b/test/validation/buffer/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libbuffer.a
-libbuffer_a_SOURCES = buffer.c
+noinst_LTLIBRARIES = libbuffer.la
+libbuffer_la_SOURCES = buffer.c
 
 bin_PROGRAMS = buffer_main$(EXEEXT)
 dist_buffer_main_SOURCES = buffer_main.c
-buffer_main_LDADD = libbuffer.a $(LIBCUNIT_COMMON) $(LIBODP)
+buffer_main_LDADD = libbuffer.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/classification/.gitignore b/test/validation/classification/.gitignore
index 3887aec17..e2cdfefe1 100644
--- a/test/validation/classification/.gitignore
+++ b/test/validation/classification/.gitignore
@@ -1,2 +1 @@
 classification_main
-libclassification.a
diff --git a/test/validation/classification/Makefile.am b/test/validation/classification/Makefile.am
index 35ed7adbf..ba468faf7 100644
--- a/test/validation/classification/Makefile.am
+++ b/test/validation/classification/Makefile.am
@@ -1,10 +1,10 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libclassification.a
-libclassification_a_SOURCES = odp_classification_basic.c \
-			      odp_classification_tests.c \
-			      classification.c
+noinst_LTLIBRARIES = libclassification.la
+libclassification_la_SOURCES = odp_classification_basic.c \
+			       odp_classification_tests.c \
+			       classification.c
 
 bin_PROGRAMS = classification_main$(EXEEXT)
 dist_classification_main_SOURCES = classification_main.c
-classification_main_LDADD = libclassification.a $(LIBCUNIT_COMMON) $(LIBODP)
+classification_main_LDADD = libclassification.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/common/.gitignore b/test/validation/common/.gitignore
deleted file mode 100644
index e8aa87626..000000000
--- a/test/validation/common/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-libcunit_common.a
-libcunit_common_as_main.a
diff --git a/test/validation/common/Makefile.am b/test/validation/common/Makefile.am
index 5548c523e..c6d019cdf 100644
--- a/test/validation/common/Makefile.am
+++ b/test/validation/common/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 include $(top_srcdir)/test/Makefile.inc
 
-noinst_LIBRARIES = libcunit_common.a
-libcunit_common_a_CFLAGS = $(AM_CFLAGS)
-libcunit_common_a_SOURCES = odp_cunit_common.c
+noinst_LTLIBRARIES = libcunit_common.la
+
+libcunit_common_la_SOURCES = odp_cunit_common.c
diff --git a/test/validation/cpumask/.gitignore b/test/validation/cpumask/.gitignore
index 1dd435060..655a1640f 100644
--- a/test/validation/cpumask/.gitignore
+++ b/test/validation/cpumask/.gitignore
@@ -1,2 +1 @@
 cpumask_main
-libcpumask.a
diff --git a/test/validation/cpumask/Makefile.am b/test/validation/cpumask/Makefile.am
index 61b65ec10..fa44f8d5e 100644
--- a/test/validation/cpumask/Makefile.am
+++ b/test/validation/cpumask/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libcpumask.a
-libcpumask_a_SOURCES = cpumask.c
+noinst_LTLIBRARIES = libcpumask.la
+libcpumask_la_SOURCES = cpumask.c
 
 bin_PROGRAMS = cpumask_main$(EXEEXT)
 dist_cpumask_main_SOURCES = cpumask_main.c
-cpumask_main_LDADD = libcpumask.a $(LIBCUNIT_COMMON) $(LIBODP)
+cpumask_main_LDADD = libcpumask.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/crypto/.gitignore b/test/validation/crypto/.gitignore
index 998752bdc..0ac55e35e 100644
--- a/test/validation/crypto/.gitignore
+++ b/test/validation/crypto/.gitignore
@@ -1,2 +1 @@
 crypto_main
-libcrypto.a
diff --git a/test/validation/crypto/Makefile.am b/test/validation/crypto/Makefile.am
index 3bf5c56d3..6c7a94ba1 100644
--- a/test/validation/crypto/Makefile.am
+++ b/test/validation/crypto/Makefile.am
@@ -1,9 +1,9 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libcrypto.a
-libcrypto_a_SOURCES = crypto.c \
-		      odp_crypto_test_inp.c
+noinst_LTLIBRARIES = libcrypto.la
+libcrypto_la_SOURCES = crypto.c \
+		       odp_crypto_test_inp.c
 
 bin_PROGRAMS = crypto_main$(EXEEXT)
 dist_crypto_main_SOURCES = crypto_main.c
-crypto_main_LDADD = libcrypto.a $(LIBCUNIT_COMMON) $(LIBODP)
+crypto_main_LDADD = libcrypto.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/errno/.gitignore b/test/validation/errno/.gitignore
index b2aafc437..12256e38c 100644
--- a/test/validation/errno/.gitignore
+++ b/test/validation/errno/.gitignore
@@ -1,2 +1 @@
 errno_main
-liberrno.a
diff --git a/test/validation/errno/Makefile.am b/test/validation/errno/Makefile.am
index 0ac5d65ef..ab3ef8878 100644
--- a/test/validation/errno/Makefile.am
+++ b/test/validation/errno/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = liberrno.a
-liberrno_a_SOURCES = errno.c
+noinst_LTLIBRARIES = liberrno.la
+liberrno_la_SOURCES = errno.c
 
 bin_PROGRAMS = errno_main$(EXEEXT)
 dist_errno_main_SOURCES = errno_main.c
-errno_main_LDADD = liberrno.a $(LIBCUNIT_COMMON) $(LIBODP)
+errno_main_LDADD = liberrno.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/init/.gitignore b/test/validation/init/.gitignore
index 79eb7137d..f433708b0 100644
--- a/test/validation/init/.gitignore
+++ b/test/validation/init/.gitignore
@@ -1,4 +1,3 @@
-libinit.a
 init_main_abort
 init_main_log
 init_main_ok
diff --git a/test/validation/init/Makefile.am b/test/validation/init/Makefile.am
index 8fdafb3eb..a54e29aea 100644
--- a/test/validation/init/Makefile.am
+++ b/test/validation/init/Makefile.am
@@ -1,6 +1,6 @@
 include ../Makefile.inc
-noinst_LIBRARIES = libinit.a
-libinit_a_SOURCES = init.c
+noinst_LTLIBRARIES = libinit.la
+libinit_la_SOURCES = init.c
 
 # most platforms are expected not to support multiple ODP inits
 # following each other: therefore 3 separate binaries are
@@ -9,6 +9,6 @@ bin_PROGRAMS = init_main_abort$(EXEEXT) init_main_log$(EXEEXT) init_main_ok$(EXE
 dist_init_main_abort_SOURCES = init_main_abort.c
 dist_init_main_log_SOURCES   = init_main_log.c
 dist_init_main_ok_SOURCES    = init_main_ok.c
-init_main_abort_LDADD = libinit.a $(LIBCUNIT_COMMON) $(LIBODP)
-init_main_log_LDADD   = libinit.a $(LIBCUNIT_COMMON) $(LIBODP)
-init_main_ok_LDADD    = libinit.a $(LIBCUNIT_COMMON) $(LIBODP)
+init_main_abort_LDADD = libinit.la $(LIBCUNIT_COMMON) $(LIBODP)
+init_main_log_LDADD   = libinit.la $(LIBCUNIT_COMMON) $(LIBODP)
+init_main_ok_LDADD    = libinit.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/packet/.gitignore b/test/validation/packet/.gitignore
index 36fb9d394..c05530d2d 100644
--- a/test/validation/packet/.gitignore
+++ b/test/validation/packet/.gitignore
@@ -1,2 +1 @@
-libpacket.a
 packet_main
diff --git a/test/validation/packet/Makefile.am b/test/validation/packet/Makefile.am
index 8e588088a..7ba7a477b 100644
--- a/test/validation/packet/Makefile.am
+++ b/test/validation/packet/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libpacket.a
-libpacket_a_SOURCES = packet.c
+noinst_LTLIBRARIES = libpacket.la
+libpacket_la_SOURCES = packet.c
 
 bin_PROGRAMS = packet_main$(EXEEXT)
 dist_packet_main_SOURCES = packet_main.c
-packet_main_LDADD = libpacket.a $(LIBCUNIT_COMMON) $(LIBODP)
+packet_main_LDADD = libpacket.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/pktio/.gitignore b/test/validation/pktio/.gitignore
index ab2eec4a9..1a5dd46e4 100644
--- a/test/validation/pktio/.gitignore
+++ b/test/validation/pktio/.gitignore
@@ -1,2 +1 @@
-libpktio.a
 pktio_main
diff --git a/test/validation/pktio/Makefile.am b/test/validation/pktio/Makefile.am
index 0ba9b0b1f..86127a18e 100644
--- a/test/validation/pktio/Makefile.am
+++ b/test/validation/pktio/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libpktio.a
-libpktio_a_SOURCES = pktio.c
+noinst_LTLIBRARIES = libpktio.la
+libpktio_la_SOURCES = pktio.c
 
 bin_PROGRAMS = pktio_main$(EXEEXT)
 dist_pktio_main_SOURCES = pktio_main.c
-pktio_main_LDADD = libpktio.a $(LIBCUNIT_COMMON) $(LIBODP)
+pktio_main_LDADD = libpktio.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/pool/.gitignore b/test/validation/pool/.gitignore
index 2c67c9f55..fc91b28d6 100644
--- a/test/validation/pool/.gitignore
+++ b/test/validation/pool/.gitignore
@@ -1,2 +1 @@
-libpool.a
 pool_main
diff --git a/test/validation/pool/Makefile.am b/test/validation/pool/Makefile.am
index dbd796318..97f3eb450 100644
--- a/test/validation/pool/Makefile.am
+++ b/test/validation/pool/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libpool.a
-libpool_a_SOURCES = pool.c
+noinst_LTLIBRARIES = libpool.la
+libpool_la_SOURCES = pool.c
 
 bin_PROGRAMS = pool_main$(EXEEXT)
 dist_pool_main_SOURCES = pool_main.c
-pool_main_LDADD = libpool.a $(LIBCUNIT_COMMON) $(LIBODP)
+pool_main_LDADD = libpool.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/queue/.gitignore b/test/validation/queue/.gitignore
index c9e40296b..469506a13 100644
--- a/test/validation/queue/.gitignore
+++ b/test/validation/queue/.gitignore
@@ -1,2 +1 @@
-libqueue.a
 queue_main
diff --git a/test/validation/queue/Makefile.am b/test/validation/queue/Makefile.am
index 3220f8c58..adeefc7ee 100644
--- a/test/validation/queue/Makefile.am
+++ b/test/validation/queue/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libqueue.a
-libqueue_a_SOURCES = queue.c
+noinst_LTLIBRARIES = libqueue.la
+libqueue_la_SOURCES = queue.c
 
 bin_PROGRAMS = queue_main$(EXEEXT)
 dist_queue_main_SOURCES = queue_main.c
-queue_main_LDADD = libqueue.a $(LIBCUNIT_COMMON) $(LIBODP)
+queue_main_LDADD = libqueue.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/random/.gitignore b/test/validation/random/.gitignore
index 5ae7ebfe8..2c88ec0b8 100644
--- a/test/validation/random/.gitignore
+++ b/test/validation/random/.gitignore
@@ -1,2 +1 @@
 random_main
-librandom.a
diff --git a/test/validation/random/Makefile.am b/test/validation/random/Makefile.am
index 2f3954729..85056d59f 100644
--- a/test/validation/random/Makefile.am
+++ b/test/validation/random/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = librandom.a
-librandom_a_SOURCES = random.c
+noinst_LTLIBRARIES = librandom.la
+librandom_la_SOURCES = random.c
 
 bin_PROGRAMS = random_main$(EXEEXT)
 dist_random_main_SOURCES = random_main.c
-random_main_LDADD = librandom.a $(LIBCUNIT_COMMON) $(LIBODP)
+random_main_LDADD = librandom.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/scheduler/.gitignore b/test/validation/scheduler/.gitignore
index 03a6f3966..b4eb30091 100644
--- a/test/validation/scheduler/.gitignore
+++ b/test/validation/scheduler/.gitignore
@@ -1,2 +1 @@
-libscheduler.a
 scheduler_main
diff --git a/test/validation/scheduler/Makefile.am b/test/validation/scheduler/Makefile.am
index 8224a6643..d5696914f 100644
--- a/test/validation/scheduler/Makefile.am
+++ b/test/validation/scheduler/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libscheduler.a
-libscheduler_a_SOURCES = scheduler.c
+noinst_LTLIBRARIES = libscheduler.la
+libscheduler_la_SOURCES = scheduler.c
 
 bin_PROGRAMS = scheduler_main$(EXEEXT)
 dist_scheduler_main_SOURCES = scheduler_main.c
-scheduler_main_LDADD = libscheduler.a $(LIBCUNIT_COMMON) $(LIBODP)
+scheduler_main_LDADD = libscheduler.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/shmem/.gitignore b/test/validation/shmem/.gitignore
index 3cb00eb94..4d82fd53a 100644
--- a/test/validation/shmem/.gitignore
+++ b/test/validation/shmem/.gitignore
@@ -1,2 +1 @@
 shmem_main
-libshmem.a
diff --git a/test/validation/shmem/Makefile.am b/test/validation/shmem/Makefile.am
index eb808ad77..d81303db2 100644
--- a/test/validation/shmem/Makefile.am
+++ b/test/validation/shmem/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libshmem.a
-libshmem_a_SOURCES = shmem.c
+noinst_LTLIBRARIES = libshmem.la
+libshmem_la_SOURCES = shmem.c
 
 bin_PROGRAMS = shmem_main$(EXEEXT)
 dist_shmem_main_SOURCES = shmem_main.c
-shmem_main_LDADD = libshmem.a $(LIBCUNIT_COMMON) $(LIBODP)
+shmem_main_LDADD = libshmem.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/synchronizers/.gitignore b/test/validation/synchronizers/.gitignore
index 3e0ff4a91..6aad9dfbd 100644
--- a/test/validation/synchronizers/.gitignore
+++ b/test/validation/synchronizers/.gitignore
@@ -1,2 +1 @@
 synchronizers_main
-libsynchronizers.a
diff --git a/test/validation/synchronizers/Makefile.am b/test/validation/synchronizers/Makefile.am
index ca412bbc5..ecb9886a3 100644
--- a/test/validation/synchronizers/Makefile.am
+++ b/test/validation/synchronizers/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libsynchronizers.a
-libsynchronizers_a_SOURCES = synchronizers.c
+noinst_LTLIBRARIES = libsynchronizers.la
+libsynchronizers_la_SOURCES = synchronizers.c
 
 bin_PROGRAMS = synchronizers_main$(EXEEXT)
 dist_synchronizers_main_SOURCES = synchronizers_main.c
-synchronizers_main_LDADD = libsynchronizers.a $(LIBCUNIT_COMMON) $(LIBODP)
+synchronizers_main_LDADD = libsynchronizers.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/system/.gitignore b/test/validation/system/.gitignore
index 7bb1f819f..347b1ee21 100644
--- a/test/validation/system/.gitignore
+++ b/test/validation/system/.gitignore
@@ -1,2 +1 @@
-libsystem.a
 system_main
diff --git a/test/validation/system/Makefile.am b/test/validation/system/Makefile.am
index f68fe77d8..dd7759c2e 100644
--- a/test/validation/system/Makefile.am
+++ b/test/validation/system/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libsystem.a
-libsystem_a_SOURCES = system.c
+noinst_LTLIBRARIES = libsystem.la
+libsystem_la_SOURCES = system.c
 
 bin_PROGRAMS = system_main$(EXEEXT)
 dist_system_main_SOURCES = system_main.c
-system_main_LDADD = libsystem.a $(LIBCUNIT_COMMON) $(LIBODP)
+system_main_LDADD = libsystem.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/thread/.gitignore b/test/validation/thread/.gitignore
index 3b80ec1ef..ab1787d97 100644
--- a/test/validation/thread/.gitignore
+++ b/test/validation/thread/.gitignore
@@ -1,2 +1 @@
-libthread.a
 thread_main
diff --git a/test/validation/thread/Makefile.am b/test/validation/thread/Makefile.am
index 218a81016..3e2b68e6d 100644
--- a/test/validation/thread/Makefile.am
+++ b/test/validation/thread/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libthread.a
-libthread_a_SOURCES = thread.c
+noinst_LTLIBRARIES = libthread.la
+libthread_la_SOURCES = thread.c
 
 bin_PROGRAMS = thread_main$(EXEEXT)
 dist_thread_main_SOURCES = thread_main.c
-thread_main_LDADD = libthread.a $(LIBCUNIT_COMMON) $(LIBODP)
+thread_main_LDADD = libthread.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/time/.gitignore b/test/validation/time/.gitignore
index 0bc4759ea..0ef3e6162 100644
--- a/test/validation/time/.gitignore
+++ b/test/validation/time/.gitignore
@@ -1,2 +1 @@
 time_main
-libtime.a
diff --git a/test/validation/time/Makefile.am b/test/validation/time/Makefile.am
index fb5395938..418107d11 100644
--- a/test/validation/time/Makefile.am
+++ b/test/validation/time/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libtime.a
-libtime_a_SOURCES = time.c
+noinst_LTLIBRARIES = libtime.la
+libtime_la_SOURCES = time.c
 
 bin_PROGRAMS = time_main$(EXEEXT)
 dist_time_main_SOURCES = time_main.c
-time_main_LDADD = libtime.a $(LIBCUNIT_COMMON) $(LIBODP)
+time_main_LDADD = libtime.la $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/timer/.gitignore b/test/validation/timer/.gitignore
index 56792c4e6..74e8fa992 100644
--- a/test/validation/timer/.gitignore
+++ b/test/validation/timer/.gitignore
@@ -1,2 +1 @@
 timer_main
-libtimer.a
diff --git a/test/validation/timer/Makefile.am b/test/validation/timer/Makefile.am
index 0db4986a9..591dfb637 100644
--- a/test/validation/timer/Makefile.am
+++ b/test/validation/timer/Makefile.am
@@ -1,8 +1,8 @@
 include ../Makefile.inc
 
-noinst_LIBRARIES = libtimer.a
-libtimer_a_SOURCES = timer.c
+noinst_LTLIBRARIES = libtimer.la
+libtimer_la_SOURCES = timer.c
 
 bin_PROGRAMS = timer_main$(EXEEXT)
 dist_timer_main_SOURCES = timer_main.c
-timer_main_LDADD = libtimer.a $(LIBCUNIT_COMMON) $(LIBODP)
+timer_main_LDADD = libtimer.la $(LIBCUNIT_COMMON) $(LIBODP)