From patchwork Thu Oct 5 18:00:15 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: 114983 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp508179edb; Thu, 5 Oct 2017 11:21:11 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBv2NqjOb9J8siEXti8lWZ5U/7LVrBvyuTfxZvU2qiY/hdQ0aIqBcEuQBiERfgH9TuQ6oUc X-Received: by 10.200.6.13 with SMTP id d13mr26034066qth.217.1507227671754; Thu, 05 Oct 2017 11:21:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507227671; cv=none; d=google.com; s=arc-20160816; b=HaUaVdAdkCLqzIW8lodYrop3HvJvWximMYIVOR3eoLJt2k5ZeW94x/pLueus1TrXJo qrf9qEq+M9oYFGrXGg6Apd+SkiU9bl+wBLvL/TqhaaWM+pIM2201uGBX/1qMVC41gPpb 9+mVuY4vGmnW6MPCZNzsC8mOdIqeDvKLftbjaxb+CksT7wnphj6BKjUrxd9DupgQD3Vg aVZFD04FSuFM24QeOu3EJgabYXaxa4lJsQ2HbtOyAxXNCDdhMiqE4DEpe6O4mlyOiBGA qg3yVphbEuBvJgH//GMFVBC/TyCCZJuuX/l6OYeRPO6u3puV1y1EsBMCVnn5rHpaPcHX UkRw== 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=6YRBdnk0o8dsCXtM2LeQezxSuKqHMLo+scKIKXDrukY=; b=W5XB6Ic1lrvwxqEOAsGqaH0V7qd/KWUJUEjHyYFD7HYj3Jsl+GHM+nd08V/JrhvOVl 81D8yI/CA5WgUWFaOsGixee+2u3NSe4ovlDfq4poIg+CJFu2QnDszllLz4PjE6CwedsS uHA5eOjXUcK2UfS3OqMLzBFLy3M7p6YMxXCSjwXGpJG/omPACQQQm0mUvS9m7i0DsLAF NNpbRh5ol2XrpojwvOlZwNyrM/Wx5ij1aMt6FErv1nJB+/wpNuZE/oHMk1PRmoM89RWd 66GoTMHhWHyT6jyRuqueqOPVr5pzfCotywkgWPYLELMOx1PQDM3GdU9+ecOQDdt/FvJR 8rBA== 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 x204si2722196qka.459.2017.10.05.11.21.11; Thu, 05 Oct 2017 11:21:11 -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 6C3CB6082A; Thu, 5 Oct 2017 18:21:11 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 D6F04644A3; Thu, 5 Oct 2017 18:04:12 +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 547B5644B4; Thu, 5 Oct 2017 18:03:31 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 9B5E764499 for ; Thu, 5 Oct 2017 18:00:52 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 414BC1242766 for ; Thu, 5 Oct 2017 21:00:51 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Y9WhmTtPJ3-0jn4BQ3E; Thu, 05 Oct 2017 21:00:45 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id AZHOFl0KbL-0iWajNTL; Thu, 05 Oct 2017 21:00:44 +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 21:00:15 +0300 Message-Id: <1507226415-26756-21-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507226415-26756-1-git-send-email-odpbot@yandex.ru> References: <1507226415-26756-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v3 20/20] helper: 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 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: 4157d06d3a16265d7d6152d7ae4918ec5623c10c **/ helper/Makefile.am | 55 ++++++++++++++++++++++--------------------- helper/test/Makefile.am | 18 +++++++------- helper/test/linux/Makefile.am | 5 ---- 3 files changed, 38 insertions(+), 40 deletions(-) delete mode 100644 helper/test/linux/Makefile.am diff --git a/helper/Makefile.am b/helper/Makefile.am index c668386d9..ee1c17d6d 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,47 +2,48 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libodphelper.pc LIB = $(top_builddir)/lib -AM_CPPFLAGS = -I$(srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include -AM_CPPFLAGS += -I$(top_srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include -AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ -AM_CPPFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ + -I$(top_builddir)/include AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ - $(srcdir)/include/odp/helper/chksum.h\ - $(srcdir)/include/odp/helper/eth.h\ - $(srcdir)/include/odp/helper/icmp.h\ - $(srcdir)/include/odp/helper/ip.h\ - $(srcdir)/include/odp/helper/ipsec.h\ - $(srcdir)/include/odp/helper/odph_api.h\ - $(srcdir)/include/odp/helper/odph_cuckootable.h\ - $(srcdir)/include/odp/helper/odph_hashtable.h\ - $(srcdir)/include/odp/helper/odph_iplookuptable.h\ - $(srcdir)/include/odp/helper/odph_lineartable.h\ - $(srcdir)/include/odp/helper/strong_types.h\ - $(srcdir)/include/odp/helper/tcp.h\ - $(srcdir)/include/odp/helper/table.h\ - $(srcdir)/include/odp/helper/threads.h \ - $(srcdir)/include/odp/helper/udp.h + include/odp/helper/chksum.h\ + include/odp/helper/eth.h\ + include/odp/helper/icmp.h\ + include/odp/helper/ip.h\ + include/odp/helper/ipsec.h\ + include/odp/helper/odph_api.h\ + include/odp/helper/odph_cuckootable.h\ + include/odp/helper/odph_hashtable.h\ + include/odp/helper/odph_iplookuptable.h\ + include/odp/helper/odph_lineartable.h\ + include/odp/helper/strong_types.h\ + include/odp/helper/tcp.h\ + include/odp/helper/table.h\ + include/odp/helper/threads.h \ + include/odp/helper/udp.h if helper_linux helperinclude_HEADERS += \ - $(srcdir)/include/odp/helper/linux.h + include/odp/helper/linux.h helperlinuxincludedir = $(includedir)/odp/helper/linux helperlinuxinclude_HEADERS = \ - $(srcdir)/include/odp/helper/linux/pthread.h \ - $(srcdir)/include/odp/helper/linux/process.h + include/odp/helper/linux/pthread.h \ + include/odp/helper/linux/process.h endif noinst_HEADERS = \ - $(srcdir)/include/odph_debug.h \ - $(srcdir)/include/odph_list_internal.h + include/odph_debug.h \ + include/odph_list_internal.h __LIB__libodphelper_la_SOURCES = \ eth.c \ diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 983e2c685..0606d5727 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -20,19 +20,21 @@ ODP_PLATFORM=${with_platform} AM_CPPFLAGS = $(INCFLAGS) AM_LDFLAGS = -static -EXECUTABLES = chksum$(EXEEXT) \ - cuckootable$(EXEEXT) \ - parse$(EXEEXT)\ - table$(EXEEXT) \ - iplookuptable$(EXEEXT) +EXECUTABLES = chksum \ + cuckootable \ + parse\ + table \ + iplookuptable #These are platform specific extensions that are not portable #They are a convenience to app writers who have chosen to #restrict their application to Linux. if helper_linux -EXECUTABLES += linux/pthread$(EXEEXT) \ - linux/process$(EXEEXT) +EXECUTABLES += linux/pthread \ + linux/process +linux_thread_SOURCES = linux/pthread.c +linux_process_SOURCES = linux/process.c endif COMPILE_ONLY = odpthreads @@ -46,7 +48,7 @@ endif test_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -dist_check_SCRIPTS = odpthreads_as_processes odpthreads_as_pthreads +check_SCRIPTS = odpthreads_as_processes odpthreads_as_pthreads chksum_SOURCES = chksum.c cuckootable_SOURCES = cuckootable.c diff --git a/helper/test/linux/Makefile.am b/helper/test/linux/Makefile.am deleted file mode 100644 index f95e04d51..000000000 --- a/helper/test/linux/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la -dist_thread_SOURCES = pthread.c -dist_process_SOURCES = process.c -process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la