| Message ID | 1405895095-6624-1-git-send-email-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 614821f4663fd4c9073714b220ae494de581d104 |
| Headers | show |
Applied! Thanks, Maxim. On 07/21/2014 02:24 AM, Anders Roxell wrote: > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > configure.ac | 3 --- > platform/linux-generic/Makefile.am | 3 --- > platform/linux-keystone2/Makefile.am | 3 --- > 3 files changed, 9 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 873ea9e..438a7d0 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -49,9 +49,6 @@ AC_ARG_WITH([platform], > [], > [with_platform=linux-generic]) > > -AM_CONDITIONAL([ODP_PLATFORM_GENERIC], [test "x$with_platform" = xlinux-generic]) > -AM_CONDITIONAL([ODP_PLATFORM_KEYSTONE2], [test "x$with_platform" = xlinux-keystone2]) > - > AC_SUBST([with_platform]) > > ########################################################################## > diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am > index 749482f..9be1f4b 100644 > --- a/platform/linux-generic/Makefile.am > +++ b/platform/linux-generic/Makefile.am > @@ -12,7 +12,6 @@ AM_CFLAGS += -I$(srcdir)/include > AM_CFLAGS += -I$(srcdir)/include/api > AM_CFLAGS += -I$(top_srcdir)/include > VPATH = $(srcdir) $(builddir) > -if ODP_PLATFORM_GENERIC > lib_LTLIBRARIES = $(LIB)/libodp.la > > include_HEADERS = \ > @@ -81,5 +80,3 @@ __LIB__libodp_la_SOURCES = \ > odp_ticketlock.c \ > odp_time.c \ > odp_timer.c > - > -endif > diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am > index 0cd4be3..12c9f5c 100644 > --- a/platform/linux-keystone2/Makefile.am > +++ b/platform/linux-keystone2/Makefile.am > @@ -24,7 +24,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) > -#if ODP_PLATFORM_KEYSTONE2 > lib_LTLIBRARIES = $(LIB)/libodp.la > KS2_LIBS="-lopenem_rh -lopenem_osal" > LIBS += $(KS2_LIBS) > @@ -92,5 +91,3 @@ __LIB__libodp_la_SOURCES = \ > ../linux-generic/odp_ticketlock.c \ > ../linux-generic/odp_time.c \ > ../linux-generic/odp_timer.c > - > -#endif
diff --git a/configure.ac b/configure.ac index 873ea9e..438a7d0 100644 --- a/configure.ac +++ b/configure.ac @@ -49,9 +49,6 @@ AC_ARG_WITH([platform], [], [with_platform=linux-generic]) -AM_CONDITIONAL([ODP_PLATFORM_GENERIC], [test "x$with_platform" = xlinux-generic]) -AM_CONDITIONAL([ODP_PLATFORM_KEYSTONE2], [test "x$with_platform" = xlinux-keystone2]) - AC_SUBST([with_platform]) ########################################################################## diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 749482f..9be1f4b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -12,7 +12,6 @@ AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(srcdir)/include/api AM_CFLAGS += -I$(top_srcdir)/include VPATH = $(srcdir) $(builddir) -if ODP_PLATFORM_GENERIC lib_LTLIBRARIES = $(LIB)/libodp.la include_HEADERS = \ @@ -81,5 +80,3 @@ __LIB__libodp_la_SOURCES = \ odp_ticketlock.c \ odp_time.c \ odp_timer.c - -endif diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am index 0cd4be3..12c9f5c 100644 --- a/platform/linux-keystone2/Makefile.am +++ b/platform/linux-keystone2/Makefile.am @@ -24,7 +24,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) -#if ODP_PLATFORM_KEYSTONE2 lib_LTLIBRARIES = $(LIB)/libodp.la KS2_LIBS="-lopenem_rh -lopenem_osal" LIBS += $(KS2_LIBS) @@ -92,5 +91,3 @@ __LIB__libodp_la_SOURCES = \ ../linux-generic/odp_ticketlock.c \ ../linux-generic/odp_time.c \ ../linux-generic/odp_timer.c - -#endif
Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- configure.ac | 3 --- platform/linux-generic/Makefile.am | 3 --- platform/linux-keystone2/Makefile.am | 3 --- 3 files changed, 9 deletions(-)