[lng-odp-dpk,14/24] odphelper: name correction after v1.14.0.0 merge

Message ID 1491483222-32154-5-git-send-email-balakrishna.garapati@linaro.org
State New
Headers show
Series
  • Untitled series #123
Related show

Commit Message

Balakrishna Garapati April 6, 2017, 12:53 p.m.
Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
---
 example/Makefile.inc                         | 2 +-
 helper/test/Makefile.am                      | 2 +-
 test/common_plat/validation/api/Makefile.inc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Yi He April 11, 2017, 6:13 a.m. | #1
Can this be combined into one with [12/24] configure: libodphelper name
correction from merge conflict

On 6 April 2017 at 20:53, Balakrishna Garapati <
balakrishna.garapati@linaro.org> wrote:

> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
> ---
>  example/Makefile.inc                         | 2 +-
>  helper/test/Makefile.am                      | 2 +-
>  test/common_plat/validation/api/Makefile.inc | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/example/Makefile.inc b/example/Makefile.inc
> index d492a8f..bdbeb82 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-dpdk.la $(LIB)/libodphelper-linux.la
> +LDADD = $(LIB)/libodp-dpdk.la $(LIB)/libodphelper.la
>  AM_CFLAGS += \
>         -I$(srcdir) \
>         -I$(top_srcdir)/example \
> diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
> index beef919..1cff7af 100644
> --- a/helper/test/Makefile.am
> +++ b/helper/test/Makefile.am
> @@ -5,7 +5,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.la $(LIB)/libodp-dpdk.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 e046b6d..fd04a19 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-dpdk.la
> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
> --
> 1.9.1
>
> _______________________________________________
> lng-odp-dpdk mailing list
> lng-odp-dpdk@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>

Patch hide | download patch | download mbox

diff --git a/example/Makefile.inc b/example/Makefile.inc
index d492a8f..bdbeb82 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-dpdk.la $(LIB)/libodphelper-linux.la
+LDADD = $(LIB)/libodp-dpdk.la $(LIB)/libodphelper.la
 AM_CFLAGS += \
 	-I$(srcdir) \
 	-I$(top_srcdir)/example \
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
index beef919..1cff7af 100644
--- a/helper/test/Makefile.am
+++ b/helper/test/Makefile.am
@@ -5,7 +5,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.la $(LIB)/libodp-dpdk.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 e046b6d..fd04a19 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-dpdk.la
+LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la