From patchwork Thu Oct 5 18:00:10 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: 114978 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp504009edb; Thu, 5 Oct 2017 11:16:18 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCIqxqNz0wwfjdfelhd1oZXf+ZSICPAfVLjPiC1lyiJzAMPW9Q1OYMHDPxAVa6aB9Psypbd X-Received: by 10.55.156.141 with SMTP id f135mr22256774qke.309.1507227378741; Thu, 05 Oct 2017 11:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507227378; cv=none; d=google.com; s=arc-20160816; b=R8s5D9Wvpz1p3IArKBqkEBn+KG2kMmHhPNpI4x+n2Lnip9CGkr7amZeDa3HXy0Yt+y t7MHo8RdmXsKXUOYhKMSn/xhfyT6BM0UFP0UFGkwj13X657ziPbgsGjQONAHmiwPqy1i fnffGW1mmfK6qk/zODne6CxE8dxwt4uTG7PbUtXDB9q44sOE+8Qnx3pLpwEXdEHFh25v TUEfr5Xcc71rs2R5wHDX4OeO4i+K/1Ed56YpK+w7A3jaducbXyuRtLRJje3q7dX7sdPH fV5P1IJBM65pXRiuFYX1siABE7d5MIHz2BVHwpchpqIMfiKrL68sgpFWxD/rFopBIZg6 iz4A== 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=TSNH8cgu4md9hsNfyS8Ny6oZFxZyW2Y8MXGgdqQSr5A=; b=DCOD25f/hfyVQ7SEF+fgN7VYpTPG3w7xgqVQI90uEQJC8sN0gEVetuV37R5fl4nwQH z3vtZUEGN2RDM5F1lzUVuJQIOSubScdPCSVNZSJCVWbH02IEIfpj7A5ZzzqPdg2JofOz T+HT3CuHDGVITHggDFurkaEGEC+4UPbN3GTeYtOUcraQDfvtWGKHLTuz7TawEQPNv9iO 9jAvdJR4CtyFnMTMT4Z/4KBinDlU1Fe+zFzqhzNAMIC5SduLCIbh8qA4RbbaMuwqkYGf /YiNI+9HLuUr9nx1I5z51Sx9B7RyqK0I1FvAtaecS55I5FSjIWD1imWgqteTIPK2upB/ btiA== 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 c52si179970qtk.270.2017.10.05.11.16.18; Thu, 05 Oct 2017 11:16:18 -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 6263E644BB; Thu, 5 Oct 2017 18:16:18 +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 671E461BC5; Thu, 5 Oct 2017 18:03:44 +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 24F956449F; Thu, 5 Oct 2017 18:03:23 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id AEFA0644A9 for ; Thu, 5 Oct 2017 18:00:43 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 67DEA34C4B74 for ; Thu, 5 Oct 2017 21:00:42 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 9IYEb0ug0t-0aSu1RPD; Thu, 05 Oct 2017 21:00:36 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id AZHOFl0KbL-0ZWKPXhL; Thu, 05 Oct 2017 21:00: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: Thu, 5 Oct 2017 21:00:10 +0300 Message-Id: <1507226415-26756-16-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 15/20] build: move handling of include files to include dir 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 There is little point in handling common headers in platform-specific dir. Move respective definitions to include/Makefie.am. 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 **/ Makefile.am | 1 + configure.ac | 7 +-- include/Makefile.am | 87 ++++++++++++++++++++++++++++++++++++++ platform/Makefile.inc | 67 ----------------------------- platform/linux-generic/Makefile.am | 14 ------ 5 files changed, 92 insertions(+), 84 deletions(-) create mode 100644 include/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0c28eb0c7..af0d2f51c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ #@with_platform@ works alone in subdir but not as part of a path??? SUBDIRS = \ + include \ test_common \ helper \ @platform_with_platform@ \ diff --git a/configure.ac b/configure.ac index 87362bd41..3209ade8b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,9 +16,6 @@ ODP_VERSION_API_MAJOR=odpapi_major_version AC_SUBST(ODP_VERSION_API_MAJOR) ODP_VERSION_API_MINOR=odpapi_minor_version AC_SUBST(ODP_VERSION_API_MINOR) -AC_CONFIG_FILES([include/odp/api/spec/version.h - include/odp/api/spec/deprecated.h]) - AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) @@ -353,6 +350,10 @@ CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([include/Makefile + include/odp/api/spec/version.h + include/odp/api/spec/deprecated.h]) + ########################################################################## # distribute the changed variables among the Makefiles diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 000000000..236c4c375 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,87 @@ +include_HEADERS = \ + odp.h \ + odp_api.h + +odpapispecincludedir= $(includedir)/odp/api/spec +odpapispecinclude_HEADERS = \ + odp/api/spec/align.h \ + odp/api/spec/atomic.h \ + odp/api/spec/barrier.h \ + odp/api/spec/buffer.h \ + odp/api/spec/byteorder.h \ + odp/api/spec/classification.h \ + odp/api/spec/compiler.h \ + odp/api/spec/cpu.h \ + odp/api/spec/cpumask.h \ + odp/api/spec/crypto.h \ + odp/api/spec/debug.h \ + odp/api/spec/errno.h \ + odp/api/spec/event.h \ + odp/api/spec/hash.h \ + odp/api/spec/hints.h \ + odp/api/spec/init.h \ + odp/api/spec/packet.h \ + odp/api/spec/packet_flags.h \ + odp/api/spec/packet_io.h \ + odp/api/spec/packet_io_stats.h \ + odp/api/spec/pool.h \ + odp/api/spec/queue.h \ + odp/api/spec/random.h \ + odp/api/spec/rwlock.h \ + odp/api/spec/rwlock_recursive.h \ + odp/api/spec/schedule.h \ + odp/api/spec/schedule_types.h \ + odp/api/spec/shared_memory.h \ + odp/api/spec/spinlock.h \ + odp/api/spec/spinlock_recursive.h \ + odp/api/spec/std_clib.h \ + odp/api/spec/std_types.h \ + odp/api/spec/sync.h \ + odp/api/spec/system_info.h \ + odp/api/spec/thread.h \ + odp/api/spec/thrmask.h \ + odp/api/spec/ticketlock.h \ + odp/api/spec/time.h \ + odp/api/spec/timer.h \ + odp/api/spec/traffic_mngr.h + +nodist_odpapispecinclude_HEADERS = \ + odp/api/spec/deprecated.h \ + odp/api/spec/version.h + +odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi +odpapiabidefaultinclude_HEADERS = \ + odp/arch/default/api/abi/buffer.h \ + odp/arch/default/api/abi/classification.h \ + odp/arch/default/api/abi/crypto.h \ + odp/arch/default/api/abi/event.h \ + odp/arch/default/api/abi/packet.h \ + odp/arch/default/api/abi/pool.h \ + odp/arch/default/api/abi/queue.h \ + odp/arch/default/api/abi/shared_memory.h + +odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +odpapiabiarchinclude_HEADERS = \ + odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h + +# Create symlink for ABI header files. Application does not need to use the arch +# specific include path for installed files. +install-data-hook: + if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ + : ; \ + else \ + $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ + $(DESTDIR)$(prefix)/include/odp/api/abi; \ + fi + +# Rerefence all nodist_*_HEADERS here +.PHONY: $(nodist_odpapispecinclude_HEADERS) +$(nodist_odpapispecinclude_HEADERS): + $(MAKE) -C $(top_builddir) $(subdir)/$@ diff --git a/platform/Makefile.inc b/platform/Makefile.inc index b1eeb361a..0086db779 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -12,70 +12,3 @@ AM_CFLAGS = "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) AM_CFLAGS += @PTHREAD_CFLAGS@ - -odpapispecincludedir= $(includedir)/odp/api/spec -odpapispecinclude_HEADERS = \ - $(top_srcdir)/include/odp/api/spec/align.h \ - $(top_srcdir)/include/odp/api/spec/atomic.h \ - $(top_srcdir)/include/odp/api/spec/barrier.h \ - $(top_srcdir)/include/odp/api/spec/buffer.h \ - $(top_srcdir)/include/odp/api/spec/byteorder.h \ - $(top_srcdir)/include/odp/api/spec/classification.h \ - $(top_srcdir)/include/odp/api/spec/compiler.h \ - $(top_srcdir)/include/odp/api/spec/cpu.h \ - $(top_srcdir)/include/odp/api/spec/cpumask.h \ - $(top_srcdir)/include/odp/api/spec/crypto.h \ - $(top_srcdir)/include/odp/api/spec/debug.h \ - $(top_srcdir)/include/odp/api/spec/errno.h \ - $(top_srcdir)/include/odp/api/spec/event.h \ - $(top_srcdir)/include/odp/api/spec/hash.h \ - $(top_srcdir)/include/odp/api/spec/hints.h \ - $(top_srcdir)/include/odp/api/spec/init.h \ - $(top_srcdir)/include/odp/api/spec/packet.h \ - $(top_srcdir)/include/odp/api/spec/packet_flags.h \ - $(top_srcdir)/include/odp/api/spec/packet_io.h \ - $(top_srcdir)/include/odp/api/spec/packet_io_stats.h \ - $(top_srcdir)/include/odp/api/spec/pool.h \ - $(top_srcdir)/include/odp/api/spec/queue.h \ - $(top_srcdir)/include/odp/api/spec/random.h \ - $(top_srcdir)/include/odp/api/spec/rwlock.h \ - $(top_srcdir)/include/odp/api/spec/rwlock_recursive.h \ - $(top_srcdir)/include/odp/api/spec/schedule.h \ - $(top_srcdir)/include/odp/api/spec/schedule_types.h \ - $(top_srcdir)/include/odp/api/spec/shared_memory.h \ - $(top_srcdir)/include/odp/api/spec/spinlock.h \ - $(top_srcdir)/include/odp/api/spec/spinlock_recursive.h \ - $(top_srcdir)/include/odp/api/spec/std_clib.h \ - $(top_srcdir)/include/odp/api/spec/std_types.h \ - $(top_srcdir)/include/odp/api/spec/sync.h \ - $(top_srcdir)/include/odp/api/spec/system_info.h \ - $(top_srcdir)/include/odp/api/spec/thread.h \ - $(top_srcdir)/include/odp/api/spec/thrmask.h \ - $(top_srcdir)/include/odp/api/spec/ticketlock.h \ - $(top_srcdir)/include/odp/api/spec/time.h \ - $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_builddir)/include/odp/api/spec/deprecated.h \ - $(top_builddir)/include/odp/api/spec/version.h - -odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi -odpapiabidefaultinclude_HEADERS = \ - $(top_srcdir)/include/odp/arch/default/api/abi/buffer.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/classification.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/crypto.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/event.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/packet.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/pool.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/queue.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/shared_memory.h - -odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi -odpapiabiarchinclude_HEADERS = \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7d79ccfc4..5a8b39a8b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -16,10 +16,6 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) -include_HEADERS = \ - $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_api.h - odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ $(srcdir)/include/odp/visibility_begin.h \ @@ -278,13 +274,3 @@ __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) if HAVE_PCAP __LIB__libodp_linux_la_LIBADD += $(PCAP_LIBS) endif - -# Create symlink for ABI header files. Application does not need to use the arch -# specific include path for installed files. -install-data-hook: - if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ - : ; \ - else \ - $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ - $(DESTDIR)$(prefix)/include/odp/api/abi; \ - fi