From patchwork Fri Oct 6 19: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: 115132 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1722169edb; Fri, 6 Oct 2017 12:27:46 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC85OOWlVGPlPi1jAvyrgP7xp2Dnj+XVWWX2NwB5YyGHmcoNhEwIZFSWx/NmlkIbRCDpDAM X-Received: by 10.36.65.201 with SMTP id b70mr4019121itd.114.1507318066427; Fri, 06 Oct 2017 12:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507318066; cv=none; d=google.com; s=arc-20160816; b=GgEVpLkbqp0SQEvCBfjsIvhP/RU5YNdcyCdy+csacgKxf/oD5ftPxp9AEaymJ9Pv3X 8gXvv2nmma7Sa16DxNcAbD428Go6g2yT5u9+vRqeA78Sj1UQO4NiBbZDD0uCJz4iuCFu qDY5mFC1wMQIVtQBcHuRE37LYcajNmOp0SrUMXAAwaJxPNmo40kErhWRlqCnpd4ERe5y Tb0sLNxKxUP1lZfcitsqucnOT/+OuGagwTFU/Ci1RVI3EJJ6Ii2M0EjqjaG7qoq2ompy RZ5Iypx/+catYQdktdRAqL4CLQ2VaX1T3JyTYTE+JsTAWVMekMyxh1GiQPV0vRhL6mML v+pg== 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=mwmbE99EQnMnou9U1M2GbWQh3kDvmx7OxlAyNE8tnmE=; b=qGzaIWXt16podfx4735ivHOso6zuKNpsn5IunZCc283Fz8B3SXBbwDNs/73UgmmegZ N/k7ldrZyMjTKci0LSWS5AblABPcvnQk+hMApa+6NHLh/2ED7AtXJsL6mT31TA+AKhmy wg07Sf8ZP8rbivBTt79nbuDJNmVouL0xIZ6AG2w4/ZnjYip4GB+JoFtHdTGyT42ezZ/c ZxzobqKcpB2DEpBEmn4duPo8NKhiCRiARlHh7GF57ZrkF+nLk3N/wIRrSQkwmuw/42+p Vq4pVk30CH5Ae5XuHfDciqoJ5rKHvM4YmrF2JcZKX4GLVHwFiFjgD4p7qadf8G9nriMP RiFQ== 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 b83si1490175ioj.386.2017.10.06.12.27.46; Fri, 06 Oct 2017 12:27:46 -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 F1A22644DC; Fri, 6 Oct 2017 19:27:45 +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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 E8C7765C21; Fri, 6 Oct 2017 19:04:33 +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 8BD4665C1B; Fri, 6 Oct 2017 19:04:27 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id A710D65BC0 for ; Fri, 6 Oct 2017 19:01:37 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward100j.mail.yandex.net (Yandex) with ESMTP id E758E5D823F0 for ; Fri, 6 Oct 2017 22:01:35 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FXWADlvepU-1ZrKdNIm; Fri, 06 Oct 2017 22:01:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-1ZteOC5X; Fri, 06 Oct 2017 22:01:35 +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: Fri, 6 Oct 2017 22:00:15 +0300 Message-Id: <1507316415-2144-21-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 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: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ 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