From patchwork Fri Jan 27 14:29:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92652 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp228890obz; Fri, 27 Jan 2017 06:30:48 -0800 (PST) X-Received: by 10.200.56.187 with SMTP id f56mr7822424qtc.234.1485527448772; Fri, 27 Jan 2017 06:30:48 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 201si3652449qkd.51.2017.01.27.06.30.48; Fri, 27 Jan 2017 06:30:48 -0800 (PST) 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6E113609EA; Fri, 27 Jan 2017 14:30:48 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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 A81BF60D1F; Fri, 27 Jan 2017 14:29:56 +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 07EAB609D7; Fri, 27 Jan 2017 14:29:49 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 7AB38609AD for ; Fri, 27 Jan 2017 14:29:47 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id x1so76115164lff.0 for ; Fri, 27 Jan 2017 06:29:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mxDoZ7WLwcHQWoker6v5cyWMS5je/uldNIW7E3A7Zis=; b=uJcEhT4HWof55pzgU52crZoBhVnQe39T5cmLgTrZzVcbMMQf2bsespQr3JwHPdS26p eDtTsNJqoagR2J+wHo+bE2f03d+J0ezXKEQMM7nLCLhXu6PANuYEFfneJS+6rH8vLu1j tKhU1LU6RNRYUEER5ls/u4fk3Y725MhGTjyEB7c0vuwS4/e81ZIE4V/yUUCWvWrf8cAM RpKNbgRrF4cATzKhwwG1OHPURaK/Bx55kcdXcb6CgoMob+rkhekqwoiFjA7Q5aRvwaUh nKRSXCFKqWFtY2tFEG7Y9XfbWwuOD5cLzbCmctewkK1X9P3dexTA6bn2URx1DCKRxtli EmDA== X-Gm-Message-State: AIkVDXIXyV4AW0ixtwQvyGVFh4nk8UtspDddnPp+zbGklIYkbZe8n6qRwN+IhYNNrILQTR85d3I= X-Received: by 10.25.21.142 with SMTP id 14mr2904540lfv.138.1485527386035; Fri, 27 Jan 2017 06:29:46 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:45 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:07 +0300 Message-Id: <20170127142921.29029-2-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 01/15] merge fix: platform/linux-generic/Makefile.am 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" Signed-off-by: Maxim Uvarov --- platform/linux-generic/Makefile.am | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e791603c..90024bda 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,11 +20,6 @@ odpinclude_HEADERS = \ $(srcdir)/include/odp/visibility_begin.h \ $(srcdir)/include/odp/visibility_end.h -odpincludedir= $(includedir)/odp -odpinclude_HEADERS = \ - $(srcdir)/include/odp/visibility_begin.h \ - $(srcdir)/include/odp/visibility_end.h - odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/align.h \ @@ -110,7 +105,6 @@ odpapiplatinclude_HEADERS = \ odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ -<<<<<<< HEAD $(srcdir)/include/odp/drv/align.h \ $(srcdir)/include/odp/drv/atomic.h \ $(srcdir)/include/odp/drv/barrier.h \ @@ -127,22 +121,17 @@ odpdrvplatinclude_HEADERS = \ $(srcdir)/include/odp/drv/plat/atomic_types.h \ $(srcdir)/include/odp/drv/plat/barrier_types.h \ $(srcdir)/include/odp/drv/plat/byteorder_types.h \ + $(srcdir)/include/odp/drv/compiler.h \ $(srcdir)/include/odp/drv/plat/driver_types.h \ $(srcdir)/include/odp/drv/plat/shm_types.h \ $(srcdir)/include/odp/drv/plat/spinlock_types.h \ $(srcdir)/include/odp/drv/plat/strong_types.h -======= - $(srcdir)/include/odp/drv/compiler.h ->>>>>>> v1.13.0.0 noinst_HEADERS = \ ${srcdir}/include/_fdserver_internal.h \ ${srcdir}/include/_ishm_internal.h \ ${srcdir}/include/_ishmphy_internal.h \ -<<<<<<< HEAD ${srcdir}/include/_ishmpool_internal.h \ -======= ->>>>>>> v1.13.0.0 ${srcdir}/include/odp_align_internal.h \ ${srcdir}/include/odp_atomic_internal.h \ ${srcdir}/include/odp_buffer_inlines.h \ @@ -188,11 +177,8 @@ __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ _ishm.c \ _ishmphy.c \ -<<<<<<< HEAD _ishmpool.c \ _modules.c \ -======= ->>>>>>> v1.13.0.0 odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \