From patchwork Tue Jan 20 15:17:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 43373 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0F78B218DB for ; Tue, 20 Jan 2015 15:18:22 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id fb4sf5681645wid.3 for ; Tue, 20 Jan 2015 07:18:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=eLJ0R81ywENtekqdhq3IHxQ2wz30YeT5DUPA9vKeT94=; b=ErseVr8oChRCA8o7oTvnpChQBBVVt4n1TRbOjuhkSHYj/ySeFACixfffsfwSxrXHPZ bt4AF8AGk96TMQpti4/6dlPnriqpfPDVOZ6Tm/CwY+Fmk8NcSz/OJxG3kABTAjnP0pvg 0kc97YFXI/B7obMbP4+sS9w/qMuoG/Mux9Vpi2vFEMe/1thSBsZWfXavu1k73Etc13eH DClowiQkbSFWL8iHZzCr7scs+rCftgCzHH6itKhek458HJ9E6sXVJW6ugy5fxFZFit+Z NPYqe5vnPrEdKa/HfemUdGr1qa8fmvqaYGTSc/XFN2ldUNbHBY9MrNzi1OGsx/UaFhlK 23Gg== X-Gm-Message-State: ALoCoQlu2iSvs1Z/nqu0/ZwiKpd6icCY9Od421SO7487o6XPXL0IR8YdeeAeDwweIiAOw2dw9HP1 X-Received: by 10.112.13.161 with SMTP id i1mr17889lbc.20.1421767100954; Tue, 20 Jan 2015 07:18:20 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.131 with SMTP id t3ls697616lag.44.gmail; Tue, 20 Jan 2015 07:18:20 -0800 (PST) X-Received: by 10.152.180.136 with SMTP id do8mr12635887lac.31.1421767100799; Tue, 20 Jan 2015 07:18:20 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id o4si15488821lbc.57.2015.01.20.07.18.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 07:18:20 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ge10so13786174lab.10 for ; Tue, 20 Jan 2015 07:18:20 -0800 (PST) X-Received: by 10.152.23.38 with SMTP id j6mr39092415laf.81.1421767100602; Tue, 20 Jan 2015 07:18:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1451922lbb; Tue, 20 Jan 2015 07:18:19 -0800 (PST) X-Received: by 10.224.28.198 with SMTP id n6mr58294328qac.15.1421767098489; Tue, 20 Jan 2015 07:18:18 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id e13si540609qaq.33.2015.01.20.07.18.17 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 20 Jan 2015 07:18:18 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDaZK-0007t1-OU; Tue, 20 Jan 2015 15:18:14 +0000 Received: from mail-la0-f43.google.com ([209.85.215.43]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDaZF-0007rk-LT for lng-odp@lists.linaro.org; Tue, 20 Jan 2015 15:18:09 +0000 Received: by mail-la0-f43.google.com with SMTP id q1so19601966lam.2 for ; Tue, 20 Jan 2015 07:18:03 -0800 (PST) X-Received: by 10.152.19.7 with SMTP id a7mr38618218lae.16.1421767083717; Tue, 20 Jan 2015 07:18:03 -0800 (PST) Received: from localhost.localdomain ([188.92.105.210]) by mx.google.com with ESMTPSA id y10sm4657492lad.36.2015.01.20.07.18.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 07:18:01 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 20 Jan 2015 18:17:29 +0300 Message-Id: <1421767049-4873-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 X-Topics: patch Subject: [lng-odp] [PATCHv3] validation: reorder Makefile.am X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 1. Reorder programs in Makefile.am to be in alphabetical order. 2. Put common source to variable. 3. Put source names on separate line to have less merge conflicts. Signed-off-by: Maxim Uvarov --- v3: rename variables as Mike suggested. test/validation/Makefile.am | 56 ++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 400d758..2b779bd 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,29 +5,47 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} +EXECUTABLES = odp_buffer \ + odp_crypto \ + odp_init \ + odp_queue \ + odp_schedule \ + odp_shm \ + odp_system \ + odp_synchronizers \ + odp_time \ + odp_timer + +COMPILE_ONLY = odp_pktio + +TESTSCRIPTS = odp_pktio_run + if ODP_CUNIT_ENABLED -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system odp_timer odp_time odp_synchronizers -check_PROGRAMS = ${bin_PROGRAMS} -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer +TESTS = $(EXECUTABLES) $(TESTSCRIPTS) +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) endif -dist_odp_init_SOURCES = odp_init.c -dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c -dist_odp_queue_SOURCES = odp_queue.c common/odp_cunit_common.c -dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ - crypto/odp_crypto_test_sync_inp.c \ - crypto/odp_crypto_test_rng.c \ - odp_crypto.c common/odp_cunit_common.c -dist_odp_shm_SOURCES = odp_shm.c common/odp_cunit_common.c -dist_odp_schedule_SOURCES = odp_schedule.c common/odp_cunit_common.c +check_PROGRAMS = ${bin_PROGRAMS} + +ODP_CU_COMMON=common/odp_cunit_common.c + +odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer dist_odp_buffer_SOURCES = buffer/odp_buffer_pool_test.c \ buffer/odp_buffer_test.c \ buffer/odp_packet_test.c \ - odp_buffer.c common/odp_cunit_common.c -dist_odp_system_SOURCES = odp_system.c common/odp_cunit_common.c -dist_odp_timer_SOURCES = odp_timer.c common/odp_cunit_common.c -dist_odp_time_SOURCES = odp_time.c common/odp_cunit_common.c + odp_buffer.c $(ODP_CU_COMMON) +dist_odp_timer_SOURCES = odp_timer.c $(ODP_CU_COMMON) +dist_odp_time_SOURCES = odp_time.c $(ODP_CU_COMMON) dist_odp_synchronizers_SOURCES = odp_synchronizers.c \ - common/odp_cunit_common.c + $(ODP_CU_COMMON) +odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto +dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ + crypto/odp_crypto_test_sync_inp.c \ + crypto/odp_crypto_test_rng.c \ + odp_crypto.c $(ODP_CU_COMMON) +dist_odp_init_SOURCES = odp_init.c +dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON) +dist_odp_queue_SOURCES = odp_queue.c $(ODP_CU_COMMON) +dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON) +dist_odp_shm_SOURCES = odp_shm.c $(ODP_CU_COMMON) +dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)