From patchwork Mon Dec 12 14:52:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 87702 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1683727qgi; Mon, 12 Dec 2016 06:59:03 -0800 (PST) X-Received: by 10.31.47.82 with SMTP id v79mr27988389vkv.2.1481554743509; Mon, 12 Dec 2016 06:59:03 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id o18si10972126uab.176.2016.12.12.06.59.03; Mon, 12 Dec 2016 06:59:03 -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 dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1BA536063F; Mon, 12 Dec 2016 14:59:03 +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 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 C7DDE60DDB; Mon, 12 Dec 2016 14:53:50 +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 45FB560CC3; Mon, 12 Dec 2016 14:53:07 +0000 (UTC) Received: from mail-qk0-f169.google.com (mail-qk0-f169.google.com [209.85.220.169]) by lists.linaro.org (Postfix) with ESMTPS id 8496B60CD0 for ; Mon, 12 Dec 2016 14:52:41 +0000 (UTC) Received: by mail-qk0-f169.google.com with SMTP id n204so84885368qke.2 for ; Mon, 12 Dec 2016 06:52:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qcYqtu9/WkKI+xdOmqZJPeJrsEotQHEQVeQ9HcJJlvM=; b=EATCsHrJKIzHqOMeDgnsBwHyP5D0fDBnGVvQPwdIsKPHxzHrZXDa6ylcmIcXMGCzjG eA8otvTtDFC8jG+Mh66/jV1sh2iVzIwIlLuh0z9I0t9LU+v0k1vRwubg3eCWfPC6IJpx 5GkxWyizE8YnZWMiitpWk7anuFkCZ9ByILo4kFM5ucZaOGYAjoP7Mgq4qxBtNTGEimEx FH1xpX/Bve1Mp3cZv68ipzEC1aOJ0+PDF8dA1V+0XShiMh6WwkmZBVTAcODb6eDUAlXl 2/f6nRs+OkCrmYl3LEm8i8YbAMAqRG2Ul5wMmHOS6J7o873maazZBaoMULH4W5WGT7Dy 6hhA== X-Gm-Message-State: AKaTC0163F0+ao+yNSdC/Lqmkb92PPVFGBcV5tQhk1oAx/T2EizzRUxiVKJ7mIFezeOYR23Z/MU= X-Received: by 10.233.232.200 with SMTP id a191mr89532017qkg.208.1481554360981; Mon, 12 Dec 2016 06:52:40 -0800 (PST) Received: from localhost (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id n79sm13033844qkn.15.2016.12.12.06.52.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Dec 2016 06:52:40 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 12 Dec 2016 09:52:29 -0500 Message-Id: <20161212145230.11412-6-mike.holmes@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161212145230.11412-1-mike.holmes@linaro.org> References: <20161212145230.11412-1-mike.holmes@linaro.org> Subject: [lng-odp] [PATCH 5/6] helper: rename libodphelper to remove -linux 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: Mike Holmes --- configure.ac | 2 +- example/Makefile.inc | 2 +- helper/Makefile.am | 6 +++--- helper/test/Makefile.am | 2 +- pkgconfig/{libodphelper-linux.pc.in => libodphelper.pc.in} | 4 ++-- test/Makefile.inc | 2 +- test/common_plat/validation/api/Makefile.inc | 2 +- test/linux-generic/Makefile.inc | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename pkgconfig/{libodphelper-linux.pc.in => libodphelper.pc.in} (77%) -- 2.9.3 diff --git a/configure.ac b/configure.ac index 39c040d..f17bcae 100644 --- a/configure.ac +++ b/configure.ac @@ -309,7 +309,7 @@ AC_CONFIG_FILES([Makefile helper/Makefile helper/test/Makefile pkgconfig/libodp-linux.pc - pkgconfig/libodphelper-linux.pc + pkgconfig/libodphelper.pc ]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/example/Makefile.inc b/example/Makefile.inc index 19d3994..70e3758 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,6 +1,6 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper-linux.la +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la AM_CFLAGS += \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/helper/Makefile.am b/helper/Makefile.am index 3805c45..0baef44 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-linux.pc +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc LIB = $(top_builddir)/lib AM_CFLAGS = -I$(srcdir)/include @@ -31,7 +31,7 @@ noinst_HEADERS = \ $(srcdir)/odph_lineartable.h \ $(srcdir)/odph_list_internal.h -__LIB__libodphelper_linux_la_SOURCES = \ +__LIB__libodphelper_la_SOURCES = \ eth.c \ ip.c \ chksum.c \ @@ -39,4 +39,4 @@ __LIB__libodphelper_linux_la_SOURCES = \ hashtable.c \ lineartable.c -lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la +lib_LTLIBRARIES = $(LIB)/libodphelper.la diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 361e45d..e7aada1 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -26,6 +26,6 @@ EXTRA_DIST = odpthreads_as_processes odpthreads_as_pthreads dist_chksum_SOURCES = chksum.c dist_odpthreads_SOURCES = odpthreads.c -odpthreads_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +odpthreads_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la dist_parse_SOURCES = parse.c dist_table_SOURCES = table.c diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper.pc.in similarity index 77% rename from pkgconfig/libodphelper-linux.pc.in rename to pkgconfig/libodphelper.pc.in index 3987f4c..b14335e 100644 --- a/pkgconfig/libodphelper-linux.pc.in +++ b/pkgconfig/libodphelper.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libodphelper-linux +Name: libodphelper Description: Helper for the ODP packet processing engine Version: @PKGCONFIG_VERSION@ -Libs: -L${libdir} -lodphelper-linux +Libs: -L${libdir} -lodphelper Libs.private: Cflags: -I${includedir} diff --git a/test/Makefile.inc b/test/Makefile.inc index 1ebc047..1ad5d3a 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -4,7 +4,7 @@ LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index ffba620..dda18ad 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -13,4 +13,4 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index 36745fe..4b88b43 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -6,7 +6,7 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = \