From patchwork Mon Jan 15 10:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124486 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp617342lje; Mon, 15 Jan 2018 02:07:52 -0800 (PST) X-Google-Smtp-Source: ACJfBoukhpVv/betfMYaYgPzRi5q9p2sO7BCANgUGmODARYY5xf03xohZ1oMnp1wuz1P/RlB5/gu X-Received: by 10.55.53.21 with SMTP id c21mr26300864qka.38.1516010872186; Mon, 15 Jan 2018 02:07:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516010872; cv=none; d=google.com; s=arc-20160816; b=Rg7rOR0WHpWQQ+D9b4ZGQkDuxVNEIlUSGTy8kFycO3eg3XDzYDz8NSiCQzp6Kpk5x+ ENUaSxUl/9vBtH2Y37nKioOrtPQJsgKdKM61oRZrKDXA2E3kggwUKOYHTwqgKHEde6Ai JTKCYjxB7wqSCijVpcMoE//R/Pt1a7OyOskI9vHak9ZY+sEE6S7JmjWS72rs5Bt5Fivc +y424hdjWXoKbCNaY0OmuIdnbBX13T4bqTVc2f/w3gsupRKsnLo+8gDfXVYl+uMFEMkT Xpcrk+zh8YOgoPcskC4ne4dDKbRGFVihbaYAepYCZGr8OFEorejhPW9Atf0p2VMvu2jc 2jrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=X6nGUPdoVX0hJ8SSF3ruDcUgj6ztQZWoZs2IZtU+lvU=; b=OFUt7lV2Ot1/0oLXCq/izIVnXwkeKrWbTdSBWi3JzJERD3ZNi/FMQTzp6bp22AzKcn 8Bz6eNE7Wghdk4KAhfGet9uhFScR1zhXVZI9DF0fqYmkXCQQ9e4volLOklIaPVHey3VC c9TLADlPcyMmSVW7L/SJspYfoaw1x9fjdmRjAAbM1wGeGfDSVlskN74V/Uls2osDjJlQ obqP8wb07Hc2Bb6uXM681HOdffMF2Fuj9Yw9XUg0thbKGzsBaXe/KhbXR4Oj18XgAdik v7Ma7kBbf0tkoCCesCkDoyxwUHg1fINwhy6+vBDd8iGLyb/YJBsa5UYgqDrr6OTU3vOW mkPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id e48si5114500qtc.99.2018.01.15.02.07.51; Mon, 15 Jan 2018 02:07:52 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A74DA6179D; Mon, 15 Jan 2018 10:07:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id AEAA061781; Mon, 15 Jan 2018 10:01:41 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id AA0CE617AA; Mon, 15 Jan 2018 10:01:37 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 23FEB6177D for ; Mon, 15 Jan 2018 10:00:25 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward101p.mail.yandex.net (Yandex) with ESMTP id E7CA06A81487 for ; Mon, 15 Jan 2018 13:00:23 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id E9yfpmJIyZ-0NMSE6xg; Mon, 15 Jan 2018 13:00:23 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZqkoG8NoF8-0Nr83HwK; Mon, 15 Jan 2018 13:00:23 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 15 Jan 2018 13:00:11 +0300 Message-Id: <1516010417-3323-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516010417-3323-1-git-send-email-odpbot@yandex.ru> References: <1516010417-3323-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v13 9/15] validation: stop overriding LDADD variable X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov LDADD variable can be used to pass other libraries (like DPDK). Stop overriding LDADD entirely. Instead use PRELDADD variable or appending to LDADD. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: 9dbaba7b2769979792f04d62a6c8accf0c6b13df **/ platform/linux-generic/test/ring/Makefile.am | 2 +- platform/linux-generic/test/validation/api/shmem/Makefile.am | 3 +-- test/Makefile.inc | 5 +++-- test/validation/api/Makefile.inc | 1 + test/validation/api/atomic/Makefile.am | 1 - test/validation/api/barrier/Makefile.am | 1 - test/validation/api/buffer/Makefile.am | 1 - test/validation/api/chksum/Makefile.am | 1 - test/validation/api/classification/Makefile.am | 1 - test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 1 - test/validation/api/errno/Makefile.am | 1 - test/validation/api/event/Makefile.am | 1 - test/validation/api/hash/Makefile.am | 1 - test/validation/api/init/Makefile.am | 3 --- test/validation/api/ipsec/Makefile.am | 5 +---- test/validation/api/lock/Makefile.am | 1 - test/validation/api/packet/Makefile.am | 1 - test/validation/api/pktio/Makefile.am | 1 - test/validation/api/pool/Makefile.am | 1 - test/validation/api/queue/Makefile.am | 1 - test/validation/api/random/Makefile.am | 1 - test/validation/api/scheduler/Makefile.am | 1 - test/validation/api/shmem/Makefile.am | 1 - test/validation/api/std_clib/Makefile.am | 1 - test/validation/api/system/Makefile.am | 1 - test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 1 - test/validation/api/timer/Makefile.am | 1 - test/validation/api/traffic_mngr/Makefile.am | 2 +- 30 files changed, 10 insertions(+), 36 deletions(-) diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 95e5e87f4..8287c7e04 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -6,4 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index f75cbc976..07d311d2f 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -7,10 +7,9 @@ test_PROGRAMS = shmem_linux shmem_odp1 shmem_odp2 shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt +shmem_linux_LDADD = #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index d4d74c25e..0b5b66dd0 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -10,8 +10,9 @@ LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +#before libodp by setting PRELDADD before the inclusion. +LDADD = $(PRELDADD) $(LIBODP) $(DPDK_PMDS) +PRELDADD = INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 871a37796..8610b5687 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,2 +1,3 @@ include $(top_srcdir)/test/Makefile.inc +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index 859e3c51a..4de45970f 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = atomic_main atomic_main_SOURCES = atomic_main.c atomic.c atomic.h -atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index b0310e3a5..aad5ddd60 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = barrier_main barrier_main_SOURCES = barrier_main.c barrier.c barrier.h -barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index 59639ff7b..901fdadc7 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = buffer_main buffer_main_SOURCES = buffer_main.c buffer.c buffer.h -buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 3227294d4..9bd443857 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = chksum_main chksum_main_SOURCES = chksum_main.c chksum.c chksum.h -chksum_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index b58703079..303a35767 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -9,4 +9,3 @@ classification_main_SOURCES = classification_main.c \ odp_classification_common.c \ classification.c \ classification.h -classification_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index ff12f56f7..e5c78d924 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -2,4 +2,4 @@ include ../Makefile.inc test_PROGRAMS = cpumask_main cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h -cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 94f1c1cae..238ce1892 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -8,4 +8,3 @@ crypto_main_SOURCES = crypto_main.c \ odp_crypto_test_inp.h \ test_vectors.h \ test_vectors_len.h -crypto_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index 9eddfb482..ad5c7ded4 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = errno_main errno_main_SOURCES = errno_main.c errno.c errno.h -errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am index be4764b58..762f93568 100644 --- a/test/validation/api/event/Makefile.am +++ b/test/validation/api/event/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = event_main event_main_SOURCES = event_main.c event.c event.h -event_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index bd098ffb6..8f0057782 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = hash_main hash_main_SOURCES = hash_main.c hash.c hash.h -hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 522c3a187..2d0661431 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -7,6 +7,3 @@ test_PROGRAMS = init_main_abort init_main_log init_main_ok init_main_abort_SOURCES = init_main_abort.c init.c init.h init_main_log_SOURCES = init_main_log.c init.c init.h init_main_ok_SOURCES = init_main_ok.c init.c init.h -init_main_abort_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_log_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_ok_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index b300c8e88..328826995 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,7 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c -ipsec_sync_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_async_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_in_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_out_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += libtestipsec.la diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index b434fe77c..c5518b3a8 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = lock_main lock_main_SOURCES = lock_main.c lock.c lock.h -lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index 43300ed0d..d33cdadbd 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = packet_main packet_main_SOURCES = packet_main.c packet.c packet.h -packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index a416fd1da..a6a16e2f0 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pktio_main pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h -pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 9e7c42b51..7951d0484 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pool_main pool_main_SOURCES = pool_main.c pool.c pool.h -pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index 9b1c6b777..5ed4638bc 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = queue_main queue_main_SOURCES = queue_main.c queue.c queue.h -queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index e9e7ffc06..8f1ba9fe0 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = random_main random_main_SOURCES = random_main.c random.c random.h -random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 34abf7d6a..3673ad7ce 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = scheduler_main scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h -scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index 8c5d7f700..9a10668f5 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = shmem_main shmem_main_SOURCES = shmem_main.c shmem.c shmem.h -shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index dc75c95cf..34b888bbb 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = std_clib_main std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h -std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index 123d3a693..e6fbb0ea5 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = system_main system_main_SOURCES = system_main.c system.c system.h -system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 1c56574f4..2282169b9 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -3,4 +3,4 @@ include ../Makefile.inc test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK thread_main_SOURCES = thread_main.c thread.c thread.h -thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 669d1226b..4c3340e06 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -9,7 +9,6 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h -time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index c953dcb34..576174400 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = timer_main timer_main_SOURCES = timer_main.c timer.c timer.h -timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index dc4f87092..82996afe0 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -9,7 +9,7 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h -traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += -lm dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS)