Merged,
Maxim.

On 11/18/2015 22:46, Bill Fischofer wrote:
Based on our discussions earlier today, this patch should be applied as it helps whether or not we split the odp.git repo.

+1

On Wed, Nov 18, 2015 at 12:14 PM, Mike Holmes <[email protected] <mailto:[email protected]>> wrote:

    On 12 November 2015 at 09:22, Nicolas Morey-Chaisemartin
    <[email protected] <mailto:[email protected]>> wrote:

        Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]
        <mailto:[email protected]>>


    Reviewed-by: Mike Holmes <[email protected]
    <mailto:[email protected]>>

        ---
         platform/Makefile.inc              | 39
        ++++++++++++++++++++++++++++++++++++++
         platform/linux-generic/Makefile.am | 39
        --------------------------------------
         2 files changed, 39 insertions(+), 39 deletions(-)

        diff --git a/platform/Makefile.inc b/platform/Makefile.inc
        index 8e8e97b..14e134c 100644
        --- a/platform/Makefile.inc
        +++ b/platform/Makefile.inc
        @@ -15,3 +15,42 @@ AM_LDFLAGS += -version-number
        '$(ODP_LIBSO_VERSION)'
         GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh $(top_srcdir)`
         AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
         AM_CFLAGS += -DPLATFORM=${with_platform}
        +
        +odpapiincludedir= $(includedir)/odp/api
        +odpapiinclude_HEADERS = \
        +  $(top_srcdir)/include/odp/api/align.h \
        +  $(top_srcdir)/include/odp/api/atomic.h \
        +  $(top_srcdir)/include/odp/api/barrier.h \
        +  $(top_srcdir)/include/odp/api/buffer.h \
        +  $(top_srcdir)/include/odp/api/byteorder.h \
        +  $(top_srcdir)/include/odp/api/classification.h \
        +  $(top_srcdir)/include/odp/api/compiler.h \
        +  $(top_srcdir)/include/odp/api/config.h \
        +  $(top_srcdir)/include/odp/api/cpu.h \
        +  $(top_srcdir)/include/odp/api/cpumask.h \
        +  $(top_srcdir)/include/odp/api/crypto.h \
        +  $(top_srcdir)/include/odp/api/debug.h \
        +  $(top_srcdir)/include/odp/api/errno.h \
        +  $(top_srcdir)/include/odp/api/event.h \
        +  $(top_srcdir)/include/odp/api/hints.h \
        +  $(top_srcdir)/include/odp/api/init.h \
        +  $(top_srcdir)/include/odp/api/packet.h \
        +  $(top_srcdir)/include/odp/api/packet_flags.h \
        +  $(top_srcdir)/include/odp/api/packet_io.h \
        +  $(top_srcdir)/include/odp/api/pool.h \
        +  $(top_srcdir)/include/odp/api/queue.h \
        +  $(top_srcdir)/include/odp/api/random.h \
        +  $(top_srcdir)/include/odp/api/rwlock.h \
        +  $(top_srcdir)/include/odp/api/schedule.h \
        +  $(top_srcdir)/include/odp/api/schedule_types.h \
        +  $(top_srcdir)/include/odp/api/shared_memory.h \
        +  $(top_srcdir)/include/odp/api/spinlock.h \
        +  $(top_srcdir)/include/odp/api/std_types.h \
        +  $(top_srcdir)/include/odp/api/sync.h \
        +  $(top_srcdir)/include/odp/api/system_info.h \
        +  $(top_srcdir)/include/odp/api/thread.h \
        +  $(top_srcdir)/include/odp/api/thrmask.h \
        +  $(top_srcdir)/include/odp/api/ticketlock.h \
        +  $(top_srcdir)/include/odp/api/time.h \
        +  $(top_srcdir)/include/odp/api/timer.h \
        +  $(top_srcdir)/include/odp/api/version.h
        \ No newline at end of file
        diff --git a/platform/linux-generic/Makefile.am
        b/platform/linux-generic/Makefile.am
        index 0135947..610e04d 100644
        --- a/platform/linux-generic/Makefile.am
        +++ b/platform/linux-generic/Makefile.am
        @@ -73,45 +73,6 @@ odpplatinclude_HEADERS = \
        $(srcdir)/include/odp/plat/timer_types.h \
        $(srcdir)/include/odp/plat/version_types.h

        -odpapiincludedir= $(includedir)/odp/api
        -odpapiinclude_HEADERS = \
        -  $(top_srcdir)/include/odp/api/align.h \
        -  $(top_srcdir)/include/odp/api/atomic.h \
        -  $(top_srcdir)/include/odp/api/barrier.h \
        -  $(top_srcdir)/include/odp/api/buffer.h \
        -  $(top_srcdir)/include/odp/api/byteorder.h \
        -  $(top_srcdir)/include/odp/api/classification.h \
        -  $(top_srcdir)/include/odp/api/compiler.h \
        -  $(top_srcdir)/include/odp/api/config.h \
        -  $(top_srcdir)/include/odp/api/cpu.h \
        -  $(top_srcdir)/include/odp/api/cpumask.h \
        -  $(top_srcdir)/include/odp/api/crypto.h \
        -  $(top_srcdir)/include/odp/api/debug.h \
        -  $(top_srcdir)/include/odp/api/errno.h \
        -  $(top_srcdir)/include/odp/api/event.h \
        -  $(top_srcdir)/include/odp/api/hints.h \
        -  $(top_srcdir)/include/odp/api/init.h \
        -  $(top_srcdir)/include/odp/api/packet.h \
        -  $(top_srcdir)/include/odp/api/packet_flags.h \
        -  $(top_srcdir)/include/odp/api/packet_io.h \
        -  $(top_srcdir)/include/odp/api/pool.h \
        -  $(top_srcdir)/include/odp/api/queue.h \
        -  $(top_srcdir)/include/odp/api/random.h \
        -  $(top_srcdir)/include/odp/api/rwlock.h \
        -  $(top_srcdir)/include/odp/api/schedule.h \
        -  $(top_srcdir)/include/odp/api/schedule_types.h \
        -  $(top_srcdir)/include/odp/api/shared_memory.h \
        -  $(top_srcdir)/include/odp/api/spinlock.h \
        -  $(top_srcdir)/include/odp/api/std_types.h \
        -  $(top_srcdir)/include/odp/api/sync.h \
        -  $(top_srcdir)/include/odp/api/system_info.h \
        -  $(top_srcdir)/include/odp/api/thread.h \
        -  $(top_srcdir)/include/odp/api/thrmask.h \
        -  $(top_srcdir)/include/odp/api/ticketlock.h \
        -  $(top_srcdir)/include/odp/api/time.h \
        -  $(top_srcdir)/include/odp/api/timer.h \
        -  $(top_srcdir)/include/odp/api/version.h
        -
         noinst_HEADERS = \
        ${srcdir}/include/odp_align_internal.h \
        ${srcdir}/include/odp_atomic_internal.h \
        --
        2.6.2.406.gaaaec35

        _______________________________________________
        lng-odp mailing list
        [email protected] <mailto:[email protected]>
        https://lists.linaro.org/mailman/listinfo/lng-odp




-- Mike Holmes
    Technical Manager - Linaro Networking Group
    Linaro.org <http://www.linaro.org/>***│ *Open source software for
    ARM SoCs


    _______________________________________________
    lng-odp mailing list
    [email protected] <mailto:[email protected]>
    https://lists.linaro.org/mailman/listinfo/lng-odp




_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp

_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to