From patchwork Wed Mar 23 16:38:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 64243 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp138552lbc; Wed, 23 Mar 2016 09:48:39 -0700 (PDT) X-Received: by 10.107.133.69 with SMTP id h66mr4524753iod.83.1458751719238; Wed, 23 Mar 2016 09:48:39 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id s193si2149660ios.84.2016.03.23.09.48.38; Wed, 23 Mar 2016 09:48:39 -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 Received: by lists.linaro.org (Postfix, from userid 109) id B4988616FD; Wed, 23 Mar 2016 16:48:38 +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,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 8B02E6172A; Wed, 23 Mar 2016 16:46: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 B54E7616F0; Wed, 23 Mar 2016 16:46:20 +0000 (UTC) Received: from mail-lf0-f41.google.com (mail-lf0-f41.google.com [209.85.215.41]) by lists.linaro.org (Postfix) with ESMTPS id F38ED616F5 for ; Wed, 23 Mar 2016 16:45:31 +0000 (UTC) Received: by mail-lf0-f41.google.com with SMTP id o73so15996349lfe.0 for ; Wed, 23 Mar 2016 09:45:31 -0700 (PDT) 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=Hbd8w4bMuIuUnqYyMafiVvCcTt1yLlWsvFviQYXuKiw=; b=I3LPMFo0YD7ocvHI95yF4LgDQqTxwFe2y1FgOVLSrYZNiSk1mMTu4jfYWdW19oItfU iP66tp49k+MKJR5POy2F5NGyYCMytvX09msve6F9Mis/Adgfm82vZ7+Grth9vU5vjDWk DpXSJRyv5yoh9M3t3y2snPK7I+EXcNRAMq4s4GW3nvROsYRJP1k4ghTZgh7XzVOiKGmf 6dN0NGMBviw/JlL2kjlng0lUdP0jjzzt2PfsKc6iSKPMAszoiouL9pnzkz0f43XhFNCF 3VDzNW7q+D/hVbLt9dp090dX1u8txHUU0WKHmdRNb6ibN8pTPbwlWkxEOBEekNvI5Cva rvqg== X-Gm-Message-State: AD7BkJJ0iam96Qp1+wMPLgBG9KM2hInydq+5n6LMZk7IEutSywgixqs1IsTLqCaSpCVQY4lJpGg= X-Received: by 10.25.28.80 with SMTP id c77mr1700721lfc.5.1458751530771; Wed, 23 Mar 2016 09:45:30 -0700 (PDT) Received: from localhost (c-c82171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.200]) by smtp.gmail.com with ESMTPSA id pe7sm76609lbc.14.2016.03.23.09.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Mar 2016 09:45:30 -0700 (PDT) From: Anders Roxell To: ricardo.salveti@linaro.org Date: Wed, 23 Mar 2016 17:38:22 +0100 Message-Id: <1458751102-16440-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458305959-26825-5-git-send-email-anders.roxell@linaro.org> References: <1458305959-26825-5-git-send-email-anders.roxell@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv2 04/11] rename libodphelper to libodphelper-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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Rename to unify the library names for different implementations. Signed-off-by: Anders Roxell Reviewed-by: Ricardo Salveti --- configure.ac | 2 +- doc/implementers-guide/implementers-guide.adoc | 1 + example/Makefile.inc | 2 +- helper/Makefile.am | 6 +++--- helper/test/Makefile.am | 4 ++-- pkg/debian/libodphelper-dev.install | 4 ---- pkg/debian/{libodphelper-dev.dirs => libodphelper-linux-dev.dirs} | 0 pkg/debian/libodphelper-linux-dev.install | 4 ++++ pkg/debian/{libodphelper.dirs => libodphelper-linux.dirs} | 0 pkg/debian/libodphelper-linux.install | 1 + pkg/debian/libodphelper.install | 1 - pkgconfig/{libodphelper.pc.in => libodphelper-linux.pc.in} | 4 ++-- platform/linux-generic/test/Makefile.inc | 2 +- test/Makefile.inc | 2 +- test/validation/Makefile.inc | 2 +- 15 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 pkg/debian/libodphelper-dev.install rename pkg/debian/{libodphelper-dev.dirs => libodphelper-linux-dev.dirs} (100%) create mode 100644 pkg/debian/libodphelper-linux-dev.install rename pkg/debian/{libodphelper.dirs => libodphelper-linux.dirs} (100%) create mode 100644 pkg/debian/libodphelper-linux.install delete mode 100644 pkg/debian/libodphelper.install rename pkgconfig/{libodphelper.pc.in => libodphelper-linux.pc.in} (76%) diff --git a/configure.ac b/configure.ac index 490e19b..f443ce4 100644 --- a/configure.ac +++ b/configure.ac @@ -322,7 +322,7 @@ AC_CONFIG_FILES([Makefile helper/Makefile helper/test/Makefile pkgconfig/libodp-linux.pc - pkgconfig/libodphelper.pc + pkgconfig/libodphelper-linux.pc scripts/Makefile ]) diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index ca434d6..8863004 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -121,6 +121,7 @@ of the libraries are libodp-linux and libodp-dpdk respectively. It is recommended that other implementations follow the same schema (odp-) to make the representation of the ODP implementations uniform in a distribution. +Additionally there is an ODP helper library to abstract OS differences. == The validation Suite == diff --git a/example/Makefile.inc b/example/Makefile.inc index f0bf71d..70ba2c0 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.la +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper-linux.la AM_CFLAGS += \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/helper/Makefile.am b/helper/Makefile.am index 4753c48..f9b509f 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.pc +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-linux.pc LIB = $(top_builddir)/lib AM_CFLAGS = -I$(srcdir)/include @@ -27,11 +27,11 @@ noinst_HEADERS = \ $(srcdir)/odph_lineartable.h \ $(srcdir)/odph_list_internal.h -__LIB__libodphelper_la_SOURCES = \ +__LIB__libodphelper_linux_la_SOURCES = \ eth.c \ ip.c \ linux.c \ hashtable.c \ lineartable.c -lib_LTLIBRARIES = $(LIB)/libodphelper.la +lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 0c374e6..7f0b67d 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -26,8 +26,8 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) dist_chksum_SOURCES = chksum.c dist_thread_SOURCES = thread.c -thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la +thread_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la dist_process_SOURCES = process.c dist_parse_SOURCES = parse.c -process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la +process_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la dist_table_SOURCES = table.c diff --git a/pkg/debian/libodphelper-dev.install b/pkg/debian/libodphelper-dev.install deleted file mode 100644 index b973af4..0000000 --- a/pkg/debian/libodphelper-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/* -usr/lib/*/lib*.so -usr/lib/*/lib*.a -usr/lib/*/pkgconfig/* diff --git a/pkg/debian/libodphelper-dev.dirs b/pkg/debian/libodphelper-linux-dev.dirs similarity index 100% rename from pkg/debian/libodphelper-dev.dirs rename to pkg/debian/libodphelper-linux-dev.dirs diff --git a/pkg/debian/libodphelper-linux-dev.install b/pkg/debian/libodphelper-linux-dev.install new file mode 100644 index 0000000..7d9a2a8 --- /dev/null +++ b/pkg/debian/libodphelper-linux-dev.install @@ -0,0 +1,4 @@ +usr/include/odp/helper/* +usr/lib/*/libodphelper-linux.so +usr/lib/*/libodphelper-linux.a +usr/lib/*/pkgconfig/libodphelper-linux* diff --git a/pkg/debian/libodphelper.dirs b/pkg/debian/libodphelper-linux.dirs similarity index 100% rename from pkg/debian/libodphelper.dirs rename to pkg/debian/libodphelper-linux.dirs diff --git a/pkg/debian/libodphelper-linux.install b/pkg/debian/libodphelper-linux.install new file mode 100644 index 0000000..896feed --- /dev/null +++ b/pkg/debian/libodphelper-linux.install @@ -0,0 +1 @@ +usr/lib/*/libodphelper-linux.so.* diff --git a/pkg/debian/libodphelper.install b/pkg/debian/libodphelper.install deleted file mode 100644 index 3ddde58..0000000 --- a/pkg/debian/libodphelper.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff --git a/pkgconfig/libodphelper.pc.in b/pkgconfig/libodphelper-linux.pc.in similarity index 76% rename from pkgconfig/libodphelper.pc.in rename to pkgconfig/libodphelper-linux.pc.in index 2993d71..71c7d5d 100644 --- a/pkgconfig/libodphelper.pc.in +++ b/pkgconfig/libodphelper-linux.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libodphelper +Name: libodphelper-linux Description: Helper for the ODP packet processing engine Version: @VERSION@ -Libs: -L${libdir} -lodphelper +Libs: -L${libdir} -lodphelper-linux Libs.private: Cflags: -I${includedir} diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc index 13707a7..527d8cb 100644 --- a/platform/linux-generic/test/Makefile.inc +++ b/platform/linux-generic/test/Makefile.inc @@ -6,7 +6,7 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common INCODP = -I$(top_srcdir)/test \ diff --git a/test/Makefile.inc b/test/Makefile.inc index b3cb4a5..c4399cb 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.la $(LIB)/libodp-linux.la +LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCFLAGS = -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc index 1535926..9f36f9d 100644 --- a/test/validation/Makefile.inc +++ b/test/validation/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.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la