From patchwork Thu Oct 5 10:00:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114887 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp68906edb; Thu, 5 Oct 2017 03:29:16 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAKpYomBCI7herx/pwfhV+eVbt97N+Ih5cquQBAoSqrv/3vT+rf/sZlfduCwe98QWOZPYJG X-Received: by 10.55.185.67 with SMTP id j64mr2553577qkf.37.1507199356086; Thu, 05 Oct 2017 03:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199356; cv=none; d=google.com; s=arc-20160816; b=v0yXf2TjQgbc4DWSTJ5Ta2nH04jShK+5jXTAtKlQFUIOL7pEFp2d6xlrFWj87G8NLw w+b2LEj+t5gSKML3qfClYwFvznlL91cXGM/rBJJddDG1dEbidrmVbqIP6WU6VmJWHr94 6jLTaO8AdoTD6K0t60O2lgm700OT6151MmYpZftDodgmCmVumw2F5gDBWZJUihSgzUbe kwaKp03Q9vdEF+F2ECONm6IWkQwtmS4ZGeV3QTYuqACSmdTd56mzZcoKNP77gx4l+HQn Sk8Y+zYDnmJk/XL7igKr/sJMWm1J66pOW1LczoKsdVyqO+GacdU/QosN4VrYcj0X/nSb SENw== 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=a7srxZkuZVO275zviKSBz0kqwMA1rnP6Ew43SBA5908=; b=VcIfKz+56QnNsJRC17qrpq68gNIo+Mr6Z05E7qNCJyrg9V2zBzyRbR+crMO57b/JPH obH3EoRzWyYp91VksXnkg+9Y5JnNGSy4mhzcpyZxntnxXHE9B13E4YlzRDDScxSy4XJf yKw8Zi/z2lC2sNGI2+EKHoPzZuEj+L7/YC1ybFmWesK1yul0PFUj5q+mgikhGlynE0UB 8K75Uypjm69avaJJDjDNxP9ZR4HwQDDSshdWxwZQBpmBHWM39aD4SMR0RW6TrJHpQ5om 4hbOEf5SBdK9ipn8u0H//agXV1gYjWNVo/CvjlJgxqsMVj3FMcxasxPBTBBtJicNUYsi 77yQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q63si3821221qkf.15.2017.10.05.03.29.15; Thu, 05 Oct 2017 03:29:16 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 B012A61E02; Thu, 5 Oct 2017 10:29:15 +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,URIBL_BLOCKED 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 E034565BDC; Thu, 5 Oct 2017 10:05:03 +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 1C7F46449D; Thu, 5 Oct 2017 10:04:45 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 59303644C5 for ; Thu, 5 Oct 2017 10:00:55 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 4DEFF7043FF for ; Thu, 5 Oct 2017 13:00:54 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 79iuYQ7Nf8-0s58UMsP; Thu, 05 Oct 2017 13:00:54 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0rqaVkeX; Thu, 05 Oct 2017 13:00:53 +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: Thu, 5 Oct 2017 13:00:16 +0300 Message-Id: <1507197617-6215-20-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 19/20] example: simplify Makefile.am's 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 - Drop unused $(srcdir) - Drop unused $(EXEEXT) - Drop unused dist_ prefixes - Merge noinst_HEADERS into proper _SOURCES - Merge -static into AM_LDFLAGS - Drop extra _CFLAGS adding -I which is already present on include path Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: f77d26100249d410e863b9db7a1a41fdad922e03 **/ example/Makefile.am | 2 ++ example/Makefile.inc | 2 +- example/classifier/Makefile.am | 9 ++----- example/generator/Makefile.am | 9 ++----- example/hello/Makefile.am | 6 ++--- example/ipfragreass/Makefile.am | 27 +++++++++----------- example/ipsec/Makefile.am | 53 ++++++++++++++++++---------------------- example/l2fwd_simple/Makefile.am | 9 ++----- example/l3fwd/Makefile.am | 15 ++++++------ example/packet/Makefile.am | 9 ++----- example/switch/Makefile.am | 9 ++----- example/time/Makefile.am | 7 +----- example/timer/Makefile.am | 11 ++------- example/traffic_mgmt/Makefile.am | 6 +---- 14 files changed, 61 insertions(+), 113 deletions(-) diff --git a/example/Makefile.am b/example/Makefile.am index 9503a1baf..695e029c9 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -10,3 +10,5 @@ SUBDIRS = classifier \ time \ timer \ traffic_mgmt + +noinst_HEADERS = example_debug.h diff --git a/example/Makefile.inc b/example/Makefile.inc index cba385b77..12edc46c0 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -11,4 +11,4 @@ AM_CFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include -AM_LDFLAGS = -L$(LIB) +AM_LDFLAGS = -L$(LIB) -static diff --git a/example/classifier/Makefile.am b/example/classifier/Makefile.am index 0c66e145b..a0003e9a4 100644 --- a/example/classifier/Makefile.am +++ b/example/classifier/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_classifier$(EXEEXT) -odp_classifier_LDFLAGS = $(AM_LDFLAGS) -static -odp_classifier_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_classifier -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_classifier_SOURCES = odp_classifier.c +odp_classifier_SOURCES = odp_classifier.c diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 49a74978a..7deeef406 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_generator$(EXEEXT) -odp_generator_LDFLAGS = $(AM_LDFLAGS) -static -odp_generator_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_generator -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_generator_SOURCES = odp_generator.c +odp_generator_SOURCES = odp_generator.c diff --git a/example/hello/Makefile.am b/example/hello/Makefile.am index 2e4e0cee5..a2d976015 100644 --- a/example/hello/Makefile.am +++ b/example/hello/Makefile.am @@ -1,10 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_hello$(EXEEXT) -odp_hello_LDFLAGS = $(AM_LDFLAGS) -static -odp_hello_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_hello -dist_odp_hello_SOURCES = odp_hello.c +odp_hello_SOURCES = odp_hello.c if test_example TESTS = odp_hello diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index f805a69ba..fa7d5c8bd 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,22 +1,17 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_ipfragreass$(EXEEXT) -odp_ipfragreass_LDFLAGS = $(AM_LDFLAGS) -static -odp_ipfragreass_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_ipfragreass -noinst_HEADERS = \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics_arm.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_fragment.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_helpers.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_ip.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_reassemble.h \ - $(top_srcdir)/example/example_debug.h - -dist_odp_ipfragreass_SOURCES = odp_ipfragreass.c \ - odp_ipfragreass_fragment.c \ - odp_ipfragreass_helpers.c \ - odp_ipfragreass_reassemble.c +odp_ipfragreass_SOURCES = odp_ipfragreass.c \ + odp_ipfragreass_fragment.c \ + odp_ipfragreass_helpers.c \ + odp_ipfragreass_reassemble.c \ + odp_ipfragreass_atomics.h \ + odp_ipfragreass_atomics_arm.h \ + odp_ipfragreass_fragment.h \ + odp_ipfragreass_helpers.h \ + odp_ipfragreass_ip.h \ + odp_ipfragreass_reassemble.h if test_example TESTS = odp_ipfragreass diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index fd9b3c722..46613065d 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -2,35 +2,30 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) -bin_PROGRAMS = odp_ipsec$(EXEEXT) -odp_ipsec_LDFLAGS = $(AM_LDFLAGS) -static -odp_ipsec_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example - -noinst_HEADERS = \ - $(top_srcdir)/example/ipsec/odp_ipsec_cache.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_fwd_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_loop_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_misc.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_sa_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_sp_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_stream.h \ - $(top_srcdir)/example/example_debug.h +bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in \ - $(srcdir)/odp_ipsec_run_ah_out \ - $(srcdir)/odp_ipsec_run_both_in \ - $(srcdir)/odp_ipsec_run_both_out \ - $(srcdir)/odp_ipsec_run_esp_in \ - $(srcdir)/odp_ipsec_run_esp_out \ - $(srcdir)/odp_ipsec_run_live \ - $(srcdir)/odp_ipsec_run_router \ - $(srcdir)/odp_ipsec_run_simple + odp_ipsec_run_ah_in \ + odp_ipsec_run_ah_out \ + odp_ipsec_run_both_in \ + odp_ipsec_run_both_out \ + odp_ipsec_run_esp_in \ + odp_ipsec_run_esp_out \ + odp_ipsec_run_live \ + odp_ipsec_run_router \ + odp_ipsec_run_simple -dist_odp_ipsec_SOURCES = odp_ipsec.c \ - odp_ipsec_sa_db.c \ - odp_ipsec_sp_db.c \ - odp_ipsec_fwd_db.c \ - odp_ipsec_loop_db.c \ - odp_ipsec_cache.c \ - odp_ipsec_stream.c +odp_ipsec_SOURCES = odp_ipsec.c \ + odp_ipsec_sa_db.c \ + odp_ipsec_sp_db.c \ + odp_ipsec_fwd_db.c \ + odp_ipsec_loop_db.c \ + odp_ipsec_cache.c \ + odp_ipsec_stream.c \ + odp_ipsec_cache.h \ + odp_ipsec_fwd_db.h \ + odp_ipsec_loop_db.h \ + odp_ipsec_misc.h \ + odp_ipsec_sa_db.h \ + odp_ipsec_sp_db.h \ + odp_ipsec_stream.h diff --git a/example/l2fwd_simple/Makefile.am b/example/l2fwd_simple/Makefile.am index fe2065452..f082335ef 100644 --- a/example/l2fwd_simple/Makefile.am +++ b/example/l2fwd_simple/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_l2fwd_simple$(EXEEXT) -odp_l2fwd_simple_LDFLAGS = $(AM_LDFLAGS) -static -odp_l2fwd_simple_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_l2fwd_simple -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c +odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c if test_example if HAVE_PCAP diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am index 21d0cf1a3..9a48ea173 100644 --- a/example/l3fwd/Makefile.am +++ b/example/l3fwd/Makefile.am @@ -1,15 +1,14 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_l3fwd$(EXEEXT) -odp_l3fwd_LDFLAGS = $(AM_LDFLAGS) -static -odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_l3fwd -noinst_HEADERS = \ - $(top_srcdir)/example/l3fwd/odp_l3fwd_db.h \ - $(top_srcdir)/example/l3fwd/odp_l3fwd_lpm.h \ - $(top_srcdir)/example/example_debug.h +odp_l3fwd_SOURCES = \ + odp_l3fwd.c \ + odp_l3fwd_db.c \ + odp_l3fwd_lpm.c \ + odp_l3fwd_db.h \ + odp_l3fwd_lpm.h -dist_odp_l3fwd_SOURCES = odp_l3fwd.c odp_l3fwd_db.c odp_l3fwd_lpm.c if test_example if HAVE_PCAP diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am index af729b098..228c3506d 100644 --- a/example/packet/Makefile.am +++ b/example/packet/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_pktio$(EXEEXT) -odp_pktio_LDFLAGS = $(AM_LDFLAGS) -static -odp_pktio_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_pktio -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_pktio_SOURCES = odp_pktio.c +odp_pktio_SOURCES = odp_pktio.c if test_example if HAVE_PCAP diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am index 4134bcf3d..2fb21bc41 100644 --- a/example/switch/Makefile.am +++ b/example/switch/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_switch$(EXEEXT) -odp_switch_LDFLAGS = $(AM_LDFLAGS) -static -odp_switch_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_switch -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_switch_SOURCES = odp_switch.c +odp_switch_SOURCES = odp_switch.c if test_example if HAVE_PCAP diff --git a/example/time/Makefile.am b/example/time/Makefile.am index c1db37591..464fbfcab 100644 --- a/example/time/Makefile.am +++ b/example/time/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_time_global$(EXEEXT) -odp_time_global_LDFLAGS = $(AM_LDFLAGS) -static -odp_time_global_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_time_global_SOURCES = time_global_test.c +odp_time_global_SOURCES = time_global_test.c diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am index edb8b2ca2..849319723 100644 --- a/example/timer/Makefile.am +++ b/example/timer/Makefile.am @@ -2,17 +2,10 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_timer_test$(EXEEXT) \ odp_timer_simple$(EXEEXT) -odp_timer_test_LDFLAGS = $(AM_LDFLAGS) -static -odp_timer_test_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -dist_odp_timer_test_SOURCES = odp_timer_test.c +odp_timer_test_SOURCES = odp_timer_test.c -odp_timer_simple_LDFLAGS = $(AM_LDFLAGS) -static -odp_timer_simple_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -dist_odp_timer_simple_SOURCES = odp_timer_simple.c +odp_timer_simple_SOURCES = odp_timer_simple.c if test_example TESTS = odp_timer_simple endif - -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h diff --git a/example/traffic_mgmt/Makefile.am b/example/traffic_mgmt/Makefile.am index c8ff79755..09aa03b1a 100644 --- a/example/traffic_mgmt/Makefile.am +++ b/example/traffic_mgmt/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_traffic_mgmt$(EXEEXT) -odp_traffic_mgmt_LDFLAGS = $(AM_LDFLAGS) -static -odp_traffic_mgmt_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -noinst_HEADERS = $(top_srcdir)/example/example_debug.h - -dist_odp_traffic_mgmt_SOURCES = odp_traffic_mgmt.c +odp_traffic_mgmt_SOURCES = odp_traffic_mgmt.c