From patchwork Thu Aug 7 10:14:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 35023 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0B4E321137 for ; Thu, 7 Aug 2014 10:15:26 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g18sf15676147oah.6 for ; Thu, 07 Aug 2014 03:15:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=GWcmrk6iPZQusgLFXn/0VasW5hYbEw+J+ssWoepDFmc=; b=Livmbqv9vsb2nIwpv04+GoOo3htYIydRsZbWMnS5wLcwRN0CvOwU8QWJ9XEH5Fa2Fh d7qDsLs8515alAkurxOBmPLi31TKaDYWNlRGdjSmXjtfbYRCAbx/0fX1PNQrm+zk1Asf /jqQ6Kc+dpJpK3/TOvLmHyWFoUJsdcmdcAG68s8z2LXJqz/XflkDNI7QGQQP8+bOHwwT hCyow28Q7+j8jNG0jsRw/0sSCJA5IIvGGhu3rKMSJLik2kYXPXBSZvezw+Zunf7WqT2X N5NOm4CH2jt03rA7a0Gnikahs/hUahMGXuJJGUI6pwJXGBaYK62nGBu1HWvPzgCd3Z3W xSWA== X-Gm-Message-State: ALoCoQlUR8V4q+l7/tBu8SynY55PdDFvTybBJpUMYXu3GHqcOlvGsVSx/Sraf8RBCpHcFKY+N3qq X-Received: by 10.43.17.134 with SMTP id qc6mr1102084icb.3.1407406525639; Thu, 07 Aug 2014 03:15:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.228 with SMTP id h91ls98478qgd.77.gmail; Thu, 07 Aug 2014 03:15:25 -0700 (PDT) X-Received: by 10.52.34.209 with SMTP id b17mr1337729vdj.49.1407406525560; Thu, 07 Aug 2014 03:15:25 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id e5si1598619vek.81.2014.08.07.03.15.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Aug 2014 03:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so5926151vcb.31 for ; Thu, 07 Aug 2014 03:15:25 -0700 (PDT) X-Received: by 10.52.9.35 with SMTP id w3mr1436769vda.12.1407406525455; Thu, 07 Aug 2014 03:15:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp17119vcb; Thu, 7 Aug 2014 03:15:24 -0700 (PDT) X-Received: by 10.140.95.241 with SMTP id i104mr11588098qge.6.1407406524680; Thu, 07 Aug 2014 03:15:24 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id il6si5561076qab.10.2014.08.07.03.15.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 07 Aug 2014 03:15:24 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XFKjD-00061Z-KI; Thu, 07 Aug 2014 10:15:23 +0000 Received: from mail-la0-f44.google.com ([209.85.215.44]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XFKj5-00061F-Ix for lng-odp@lists.linaro.org; Thu, 07 Aug 2014 10:15:15 +0000 Received: by mail-la0-f44.google.com with SMTP id el20so2301931lab.17 for ; Thu, 07 Aug 2014 03:15:09 -0700 (PDT) X-Received: by 10.112.128.233 with SMTP id nr9mr13999242lbb.43.1407406509719; Thu, 07 Aug 2014 03:15:09 -0700 (PDT) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id p4sm1862323lap.0.2014.08.07.03.15.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 07 Aug 2014 03:15:08 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Thu, 7 Aug 2014 12:14:59 +0200 Message-Id: <1407406499-11658-2-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407406499-11658-1-git-send-email-anders.roxell@linaro.org> References: <1407406499-11658-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 2/2] platform/*/Makefile.am: move generic parts to inc file X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Anders Roxell Acked-by: Taras Kondratiuk --- platform/Makefile.inc | 11 +++++++++++ platform/linux-dpdk/Makefile.am | 11 +---------- platform/linux-generic/Makefile.am | 11 +---------- platform/linux-keystone2/Makefile.am | 11 +---------- 4 files changed, 14 insertions(+), 30 deletions(-) create mode 100644 platform/Makefile.inc diff --git a/platform/Makefile.inc b/platform/Makefile.inc new file mode 100644 index 0000000..6ffa2ad --- /dev/null +++ b/platform/Makefile.inc @@ -0,0 +1,11 @@ +LIB = $(top_builddir)/lib + +dist_pkgdata_DATA = $(LIB)/libodp.la + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc + +.PHONY: pkgconfig/libodp.pc + +VPATH = $(srcdir) $(builddir) +lib_LTLIBRARIES = $(LIB)/libodp.la diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 37150f2..fb87d41 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -1,12 +1,5 @@ include $(top_srcdir)/Makefile.inc -LIB = $(top_builddir)/lib - -dist_pkgdata_DATA = $(LIB)/libodp.la - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc - -.PHONY: pkgconfig/libodp.pc +include $(top_srcdir)/platform/Makefile.inc PLAT_CFLAGS = -msse4.2 if SDK_INSTALL_PATH_ @@ -25,8 +18,6 @@ AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include/api AM_CFLAGS += -I$(top_srcdir)/include -VPATH = $(srcdir) $(builddir) -lib_LTLIBRARIES = $(LIB)/libodp.la DPDK_LIBS="-lintel_dpdk -ldl" LIBS += $(DPDK_LIBS) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 91a208a..41458d8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -1,18 +1,9 @@ include $(top_srcdir)/Makefile.inc -LIB = $(top_builddir)/lib - -dist_pkgdata_DATA = $(LIB)/libodp.la - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc - -.PHONY: pkgconfig/libodp.pc +include $(top_srcdir)/platform/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(srcdir)/include/api AM_CFLAGS += -I$(top_srcdir)/include -VPATH = $(srcdir) $(builddir) -lib_LTLIBRARIES = $(LIB)/libodp.la include_HEADERS = \ $(top_srcdir)/include/odp.h \ diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am index 3d48b54..b32c539 100644 --- a/platform/linux-keystone2/Makefile.am +++ b/platform/linux-keystone2/Makefile.am @@ -1,12 +1,5 @@ include $(top_srcdir)/Makefile.inc -LIB = $(top_builddir)/lib - -dist_pkgdata_DATA = $(LIB)/libodp.la - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc - -.PHONY: pkgconfig/libodp.pc +include $(top_srcdir)/platform/Makefile.inc KS2_PLATFORM = DEVICE_K2K if SDK_INSTALL_PATH_ @@ -28,8 +21,6 @@ AM_CFLAGS += -I$(srcdir)/include/api AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include/api AM_CFLAGS += -I$(top_srcdir)/include -VPATH = $(srcdir) $(builddir) -lib_LTLIBRARIES = $(LIB)/libodp.la KS2_LIBS="-lopenem_rh -lopenem_osal" LIBS += $(KS2_LIBS)