diff mbox

[RFC,PATCHv2,1/4] Remove current Makefile system and move platform sources

Message ID 1403385619-31924-2-git-send-email-anders.roxell@linaro.org
State New
Headers show

Commit Message

Anders Roxell June 21, 2014, 9:20 p.m. UTC 
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 Makefile                                           |  49 -------
 Makefile.inc                                       |  62 ---------
 platform/linux-generic/Makefile                    | 142 ---------------------
 platform/linux-generic/{source => }/odp_barrier.c  |   0
 platform/linux-generic/{source => }/odp_buffer.c   |   0
 .../linux-generic/{source => }/odp_buffer_pool.c   |   0
 platform/linux-generic/{source => }/odp_coremask.c |   0
 platform/linux-generic/{source => }/odp_init.c     |   0
 platform/linux-generic/{source => }/odp_linux.c    |   0
 platform/linux-generic/{source => }/odp_packet.c   |   0
 .../linux-generic/{source => }/odp_packet_flags.c  |   0
 .../linux-generic/{source => }/odp_packet_io.c     |   0
 .../linux-generic/{source => }/odp_packet_netmap.c |   0
 .../linux-generic/{source => }/odp_packet_socket.c |   0
 platform/linux-generic/{source => }/odp_queue.c    |   0
 platform/linux-generic/{source => }/odp_ring.c     |   0
 platform/linux-generic/{source => }/odp_rwlock.c   |   0
 platform/linux-generic/{source => }/odp_schedule.c |   0
 .../linux-generic/{source => }/odp_shared_memory.c |   0
 platform/linux-generic/{source => }/odp_spinlock.c |   0
 .../linux-generic/{source => }/odp_system_info.c   |   0
 platform/linux-generic/{source => }/odp_thread.c   |   0
 .../linux-generic/{source => }/odp_ticketlock.c    |   0
 platform/linux-generic/{source => }/odp_time.c     |   0
 platform/linux-generic/{source => }/odp_timer.c    |   0
 platform/linux-keystone2/Makefile                  | 118 -----------------
 platform/linux-keystone2/{source => }/odp_buffer.c |   0
 .../linux-keystone2/{source => }/odp_buffer_pool.c |   0
 platform/linux-keystone2/{source => }/odp_init.c   |   0
 platform/linux-keystone2/{source => }/odp_packet.c |   0
 .../linux-keystone2/{source => }/odp_packet_io.c   |   0
 platform/linux-keystone2/{source => }/odp_queue.c  |   0
 .../{source => }/odp_shared_memory.c               |   0
 test/Makefile                                      |  17 ---
 test/Makefile.inc                                  |   7 -
 test/api_test/Makefile                             |  87 -------------
 test/example/Makefile                              |  44 -------
 test/generator/Makefile                            |  44 -------
 test/l2fwd/Makefile                                |  43 -------
 test/packet/Makefile                               |  43 -------
 test/packet_netmap/Makefile                        |  45 -------
 test/timer/Makefile                                |  44 -------
 42 files changed, 745 deletions(-)
 delete mode 100644 Makefile
 delete mode 100644 Makefile.inc
 delete mode 100644 platform/linux-generic/Makefile
 rename platform/linux-generic/{source => }/odp_barrier.c (100%)
 rename platform/linux-generic/{source => }/odp_buffer.c (100%)
 rename platform/linux-generic/{source => }/odp_buffer_pool.c (100%)
 rename platform/linux-generic/{source => }/odp_coremask.c (100%)
 rename platform/linux-generic/{source => }/odp_init.c (100%)
 rename platform/linux-generic/{source => }/odp_linux.c (100%)
 rename platform/linux-generic/{source => }/odp_packet.c (100%)
 rename platform/linux-generic/{source => }/odp_packet_flags.c (100%)
 rename platform/linux-generic/{source => }/odp_packet_io.c (100%)
 rename platform/linux-generic/{source => }/odp_packet_netmap.c (100%)
 rename platform/linux-generic/{source => }/odp_packet_socket.c (100%)
 rename platform/linux-generic/{source => }/odp_queue.c (100%)
 rename platform/linux-generic/{source => }/odp_ring.c (100%)
 rename platform/linux-generic/{source => }/odp_rwlock.c (100%)
 rename platform/linux-generic/{source => }/odp_schedule.c (100%)
 rename platform/linux-generic/{source => }/odp_shared_memory.c (100%)
 rename platform/linux-generic/{source => }/odp_spinlock.c (100%)
 rename platform/linux-generic/{source => }/odp_system_info.c (100%)
 rename platform/linux-generic/{source => }/odp_thread.c (100%)
 rename platform/linux-generic/{source => }/odp_ticketlock.c (100%)
 rename platform/linux-generic/{source => }/odp_time.c (100%)
 rename platform/linux-generic/{source => }/odp_timer.c (100%)
 delete mode 100644 platform/linux-keystone2/Makefile
 rename platform/linux-keystone2/{source => }/odp_buffer.c (100%)
 rename platform/linux-keystone2/{source => }/odp_buffer_pool.c (100%)
 rename platform/linux-keystone2/{source => }/odp_init.c (100%)
 rename platform/linux-keystone2/{source => }/odp_packet.c (100%)
 rename platform/linux-keystone2/{source => }/odp_packet_io.c (100%)
 rename platform/linux-keystone2/{source => }/odp_queue.c (100%)
 rename platform/linux-keystone2/{source => }/odp_shared_memory.c (100%)
 delete mode 100644 test/Makefile
 delete mode 100644 test/Makefile.inc
 delete mode 100644 test/api_test/Makefile
 delete mode 100644 test/example/Makefile
 delete mode 100644 test/generator/Makefile
 delete mode 100644 test/l2fwd/Makefile
 delete mode 100644 test/packet/Makefile
 delete mode 100644 test/packet_netmap/Makefile
 delete mode 100644 test/timer/Makefile
diff mbox

Patch

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7d10fd5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:	BSD-3-Clause
-
-.DEFAULT_GOAL := default
-
-ODP_ROOT        = $(CURDIR)
-ODP_TESTS       = $(ODP_ROOT)/test
-
-include $(ODP_ROOT)/Makefile.inc
-
-.PHONY: default
-default: lib tests
-
-.PHONY: all
-all: tests_install docs_install
-
-.PHONY: tests_install
-tests_install: tests
-	$(MAKE) -C test install
-
-.PHONY: tests
-tests: libs_install
-	$(MAKE) -C $(ODP_TESTS)
-
-.PHONY: docs
-docs:
-	$(MAKE) -C $(ODP_DIR) docs
-
-.PHONY: docs_install
-docs_install: docs
-	$(MAKE) -C $(ODP_DIR) docs_install
-
-.PHONY: lib
-lib:
-	$(MAKE) -C $(ODP_DIR) libs
-
-.PHONY: clean
-clean:
-	$(MAKE) -C $(ODP_DIR) clean
-	$(MAKE) -C $(ODP_TESTS) clean
-
-.PHONY: libs_install
-libs_install: lib
-	$(MAKE) -C platform/$(PLATFORM) install
-
-.PHONY: install
-install: libs_install docs_install tests_install
diff --git a/Makefile.inc b/Makefile.inc
deleted file mode 100644
index ff16043..0000000
--- a/Makefile.inc
+++ /dev/null
@@ -1,62 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:	BSD-3-Clause
-
-PLATFORM ?= linux-generic
-OBJ_DIR   = ./obj
-ODP_DIR   = $(ODP_ROOT)/platform/$(PLATFORM)
-
-export DESTDIR  = $(ODP_ROOT)/build
-
-CC     ?= gcc
-LD     ?= gcc
-AR     ?= ar
-ECHO   := @echo
-MKDIR  := mkdir -p
-RMDIR  := rm -rf
-RM     := rm -f
-COPY   := cp -r
-SYNC   := rsync -a --delete
-
-ifneq ($(VERBOSE),yes)
-Q          = @
-MAKEFLAGS += --no-print-directory
-endif
-
-QUIET_CC   = $(Q:@=@echo    '     CC       '$@;)
-QUIET_LD   = $(Q:@=@echo    '     LD       '$@;)
-QUIET_AR   = $(Q:@=@echo    '     AR       '$@;)
-export Q QUIET_CC QUIET_LD QUIET_AR
-
-ifeq ($(ODP_DEBUG_PRINT),no)
-EXTRA_CFLAGS += -DODP_DEBUG_PRINT=0
-else
-EXTRA_CFLAGS += -DODP_DEBUG_PRINT=1
-endif
-
-ifeq ($(DEBUG),yes)
-EXTRA_CFLAGS += -O0 -g
-else
-EXTRA_CFLAGS += -O3
-endif
-
-EXTRA_CFLAGS += -pthread
-EXTRA_CFLAGS += -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-EXTRA_CFLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-EXTRA_CFLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
-EXTRA_CFLAGS += -Wformat-security -Wundef -Wwrite-strings
-
-
-LDFLAGS += -pthread
-LDFLAGS += $(CFLAGS)
-
-STD_LIBS += -lrt
-
-include $(wildcard $(ODP_DIR)/Makefile.inc)
-
-.PHONY: default
-default:
-
-$(OBJ_DIR):
-	$(Q)$(MKDIR) $(OBJ_DIR)
diff --git a/platform/linux-generic/Makefile b/platform/linux-generic/Makefile
deleted file mode 100644
index 0737656..0000000
--- a/platform/linux-generic/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@ 
-## Copyright (c) 2013, Linaro Limited
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions are met:
-##
-##    * Redistributions of source code must retain the above copyright notice, this
-##      list of conditions and the following disclaimer.
-##
-##    * Redistributions in binary form must reproduce the above copyright notice, this
-##      list of conditions and the following disclaimer in the documentation and/or
-##      other materials provided with the distribution.
-##
-##    * Neither the name of Linaro Limited nor the names of its contributors may be
-##      used to endorse or promote products derived from this software without specific
-##      prior written permission.
-##
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-## WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-.DEFAULT_GOAL := libs
-
-ODP_ROOT = ../..
-LIB_DIR  = ./lib
-DOC_DIR  = ./doc
-
-EXTRA_CFLAGS  += -I$(ODP_ROOT)/include
-EXTRA_CFLAGS  += -I./include
-EXTRA_CFLAGS  += -I./include/api
-
-# Option for shared libraries.
-# Decreases performance with static libraries.
-ifeq ($(ODP_RELOC),yes)
-EXTRA_CFLAGS  += -fpic
-endif
-
-ifeq ($(ODP_HAVE_NETMAP),yes)
-EXTRA_CFLAGS  += -DODP_HAVE_NETMAP
-endif
-
-include $(ODP_ROOT)/Makefile.inc
-STATIC_LIB = ./lib/libodp.a
-
-#
-# Object files
-#
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_barrier.o
-OBJS    += $(OBJ_DIR)/odp_buffer.o
-OBJS    += $(OBJ_DIR)/odp_buffer_pool.o
-OBJS    += $(OBJ_DIR)/odp_coremask.o
-OBJS    += $(OBJ_DIR)/odp_init.o
-OBJS    += $(OBJ_DIR)/odp_linux.o
-OBJS    += $(OBJ_DIR)/odp_packet.o
-OBJS    += $(OBJ_DIR)/odp_packet_flags.o
-OBJS    += $(OBJ_DIR)/odp_packet_io.o
-OBJS    += $(OBJ_DIR)/odp_packet_socket.o
-OBJS    += $(OBJ_DIR)/odp_queue.o
-OBJS    += $(OBJ_DIR)/odp_schedule.o
-OBJS    += $(OBJ_DIR)/odp_shared_memory.o
-OBJS    += $(OBJ_DIR)/odp_spinlock.o
-OBJS    += $(OBJ_DIR)/odp_system_info.o
-OBJS    += $(OBJ_DIR)/odp_thread.o
-OBJS    += $(OBJ_DIR)/odp_ticketlock.o
-OBJS    += $(OBJ_DIR)/odp_time.o
-OBJS    += $(OBJ_DIR)/odp_timer.o
-OBJS    += $(OBJ_DIR)/odp_ring.o
-OBJS    += $(OBJ_DIR)/odp_rwlock.o
-ifeq ($(ODP_HAVE_NETMAP),yes)
-OBJS    += $(OBJ_DIR)/odp_packet_netmap.o
-endif
-
-DEPS     = $(OBJS:.o=.d)
-
-.PHONY: all
-all: libs docs
-
--include $(DEPS)
-
-$(LIB_DIR):
-	$(Q)$(MKDIR) $(LIB_DIR)
-
-$(DOC_DIR):
-	$(Q)$(MKDIR) $(DOC_DIR)/html
-	$(Q)$(MKDIR) $(DOC_DIR)/latex
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: ./source/%.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Lib rule
-#
-$(STATIC_LIB): $(OBJS)
-	$(QUIET_AR)$(AR) -cr $@ $(OBJS)
-
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RMDIR) $(LIB_DIR)
-	$(Q)$(RMDIR) $(DOC_DIR)
-	$(Q)$(RM) Doxyfile
-
-Doxyfile: Doxyfile.in
-	doxygen -u - < $< > $@
-
-.PHONY: docs
-docs: $(DOC_DIR) Doxyfile ./include/odp*.h
-	doxygen
-
-.PHONY: docs_install
-docs_install: docs
-	$(SYNC) doc $(DESTDIR)
-
-.PHONY: pdf
-pdf: docs
-	make --directory doc/latex refman.pdf 1> /dev/null
-
-.PHONY: libs
-libs: $(OBJ_DIR) $(LIB_DIR) $(STATIC_LIB)
-
-.PHONY: lib_install
-lib_install: libs
-	$(Q)install -d $(DESTDIR)/lib
-	$(Q)install -m 0644 ${STATIC_LIB} $(DESTDIR)/lib/
-
-.PHONY: headers_install
-headers_install: libs
-	$(ECHO) Installing headers to $(DESTDIR)/include
-	$(Q)$(SYNC) $(ODP_ROOT)/include $(DESTDIR)
-	$(Q)$(SYNC) include/api/* $(DESTDIR)/include/
-
-install: lib_install headers_install
diff --git a/platform/linux-generic/source/odp_barrier.c b/platform/linux-generic/odp_barrier.c
similarity index 100%
rename from platform/linux-generic/source/odp_barrier.c
rename to platform/linux-generic/odp_barrier.c
diff --git a/platform/linux-generic/source/odp_buffer.c b/platform/linux-generic/odp_buffer.c
similarity index 100%
rename from platform/linux-generic/source/odp_buffer.c
rename to platform/linux-generic/odp_buffer.c
diff --git a/platform/linux-generic/source/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c
similarity index 100%
rename from platform/linux-generic/source/odp_buffer_pool.c
rename to platform/linux-generic/odp_buffer_pool.c
diff --git a/platform/linux-generic/source/odp_coremask.c b/platform/linux-generic/odp_coremask.c
similarity index 100%
rename from platform/linux-generic/source/odp_coremask.c
rename to platform/linux-generic/odp_coremask.c
diff --git a/platform/linux-generic/source/odp_init.c b/platform/linux-generic/odp_init.c
similarity index 100%
rename from platform/linux-generic/source/odp_init.c
rename to platform/linux-generic/odp_init.c
diff --git a/platform/linux-generic/source/odp_linux.c b/platform/linux-generic/odp_linux.c
similarity index 100%
rename from platform/linux-generic/source/odp_linux.c
rename to platform/linux-generic/odp_linux.c
diff --git a/platform/linux-generic/source/odp_packet.c b/platform/linux-generic/odp_packet.c
similarity index 100%
rename from platform/linux-generic/source/odp_packet.c
rename to platform/linux-generic/odp_packet.c
diff --git a/platform/linux-generic/source/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c
similarity index 100%
rename from platform/linux-generic/source/odp_packet_flags.c
rename to platform/linux-generic/odp_packet_flags.c
diff --git a/platform/linux-generic/source/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
similarity index 100%
rename from platform/linux-generic/source/odp_packet_io.c
rename to platform/linux-generic/odp_packet_io.c
diff --git a/platform/linux-generic/source/odp_packet_netmap.c b/platform/linux-generic/odp_packet_netmap.c
similarity index 100%
rename from platform/linux-generic/source/odp_packet_netmap.c
rename to platform/linux-generic/odp_packet_netmap.c
diff --git a/platform/linux-generic/source/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c
similarity index 100%
rename from platform/linux-generic/source/odp_packet_socket.c
rename to platform/linux-generic/odp_packet_socket.c
diff --git a/platform/linux-generic/source/odp_queue.c b/platform/linux-generic/odp_queue.c
similarity index 100%
rename from platform/linux-generic/source/odp_queue.c
rename to platform/linux-generic/odp_queue.c
diff --git a/platform/linux-generic/source/odp_ring.c b/platform/linux-generic/odp_ring.c
similarity index 100%
rename from platform/linux-generic/source/odp_ring.c
rename to platform/linux-generic/odp_ring.c
diff --git a/platform/linux-generic/source/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c
similarity index 100%
rename from platform/linux-generic/source/odp_rwlock.c
rename to platform/linux-generic/odp_rwlock.c
diff --git a/platform/linux-generic/source/odp_schedule.c b/platform/linux-generic/odp_schedule.c
similarity index 100%
rename from platform/linux-generic/source/odp_schedule.c
rename to platform/linux-generic/odp_schedule.c
diff --git a/platform/linux-generic/source/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
similarity index 100%
rename from platform/linux-generic/source/odp_shared_memory.c
rename to platform/linux-generic/odp_shared_memory.c
diff --git a/platform/linux-generic/source/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c
similarity index 100%
rename from platform/linux-generic/source/odp_spinlock.c
rename to platform/linux-generic/odp_spinlock.c
diff --git a/platform/linux-generic/source/odp_system_info.c b/platform/linux-generic/odp_system_info.c
similarity index 100%
rename from platform/linux-generic/source/odp_system_info.c
rename to platform/linux-generic/odp_system_info.c
diff --git a/platform/linux-generic/source/odp_thread.c b/platform/linux-generic/odp_thread.c
similarity index 100%
rename from platform/linux-generic/source/odp_thread.c
rename to platform/linux-generic/odp_thread.c
diff --git a/platform/linux-generic/source/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c
similarity index 100%
rename from platform/linux-generic/source/odp_ticketlock.c
rename to platform/linux-generic/odp_ticketlock.c
diff --git a/platform/linux-generic/source/odp_time.c b/platform/linux-generic/odp_time.c
similarity index 100%
rename from platform/linux-generic/source/odp_time.c
rename to platform/linux-generic/odp_time.c
diff --git a/platform/linux-generic/source/odp_timer.c b/platform/linux-generic/odp_timer.c
similarity index 100%
rename from platform/linux-generic/source/odp_timer.c
rename to platform/linux-generic/odp_timer.c
diff --git a/platform/linux-keystone2/Makefile b/platform/linux-keystone2/Makefile
deleted file mode 100644
index a0e2922..0000000
--- a/platform/linux-keystone2/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@ 
-##
-## Copyright (c) 2013, Linaro Limited
-## All rights reserved.
-##
-## SPDX-License-Identifier:     BSD-3-Clause
-##
-
-.DEFAULT_GOAL := libs
-
-ODP_ROOT = ../..
-LIB_DIR  = ./lib
-DOC_DIR  = ./doc
-
-LINUX_GENERIC_DIR = ../linux-generic
-
-# Option for shared libraries.
-# Decreases performance with static libraries.
-ifeq ($(ODP_RELOC),yes)
-EXTRA_CFLAGS  += -fpic
-endif
-
-MY_PLATFORM  = DEVICE_K2K
-
-PLAT_CFLAGS  = -D$(MY_PLATFORM)
-PLAT_CFLAGS += -D_GNU_SOURCE -DEM_32_BIT -DTI_EM_CENTRAL_SCHED
-PLAT_CFLAGS += -DTI_EM_TRACE_LEVEL=3 -DEM_CHECK_LEVEL=1
-PLAT_CFLAGS += -DTI_EM_LINUX -DTI_EM_GCC -DTI_EM_ARM_A15 -DTI_EM_C6638
-PLAT_CFLAGS += -D_LITTLE_ENDIAN -DTI_EM_USE_MSM -DTI_EM_XGE_LOOPBACK
-PLAT_CFLAGS += -DTI_ODP
-
-EXTRA_CFLAGS  += $(PLAT_CFLAGS)
-EXTRA_CFLAGS  += -I./include
-EXTRA_CFLAGS  += -I./include/api
-EXTRA_CFLAGS  += -I$(LINUX_GENERIC_DIR)/include
-EXTRA_CFLAGS  += -I$(LINUX_GENERIC_DIR)/include/api
-EXTRA_CFLAGS  += -I$(ODP_ROOT)/include
-
-include $(ODP_ROOT)/Makefile.inc
-STATIC_LIB = ./lib/libodp.a
-
-#
-# Object files
-#
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_barrier.o
-OBJS    += $(OBJ_DIR)/odp_buffer.o
-OBJS    += $(OBJ_DIR)/odp_buffer_pool.o
-OBJS    += $(OBJ_DIR)/odp_coremask.o
-OBJS    += $(OBJ_DIR)/odp_init.o
-OBJS    += $(OBJ_DIR)/odp_linux.o
-OBJS    += $(OBJ_DIR)/odp_packet.o
-OBJS    += $(OBJ_DIR)/odp_packet_flags.o
-OBJS    += $(OBJ_DIR)/odp_packet_io.o
-OBJS    += $(OBJ_DIR)/odp_packet_socket.o
-OBJS    += $(OBJ_DIR)/odp_queue.o
-OBJS    += $(OBJ_DIR)/odp_schedule.o
-OBJS    += $(OBJ_DIR)/odp_shared_memory.o
-OBJS    += $(OBJ_DIR)/odp_spinlock.o
-OBJS    += $(OBJ_DIR)/odp_system_info.o
-OBJS    += $(OBJ_DIR)/odp_thread.o
-OBJS    += $(OBJ_DIR)/odp_ticketlock.o
-OBJS    += $(OBJ_DIR)/odp_time.o
-OBJS    += $(OBJ_DIR)/odp_timer.o
-OBJS    += $(OBJ_DIR)/odp_ring.o
-OBJS    += $(OBJ_DIR)/odp_rwlock.o
-
-DEPS     = $(OBJS:.o=.d)
-
-.PHONY: all
-all: libs
-
--include $(DEPS)
-
-$(LIB_DIR):
-	$(Q)$(MKDIR) $(LIB_DIR)
-
-#
-# Compile rules
-#
-vpath %.c source:$(LINUX_GENERIC_DIR)/source
-
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Lib rule
-#
-$(OBJ_DIR)/libodp.o: $(OBJS)
-	$(QUIET_LD)$(LD) -r -o $@ $(OBJS) $(LDFLAGS) -lopenem_rh -lopenem_osal
-
-$(STATIC_LIB): $(OBJ_DIR)/libodp.o
-	$(QUIET_AR)$(AR) -cr $@ $(OBJ_DIR)/libodp.o
-
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RMDIR) $(LIB_DIR)
-
-.PHONY: docs
-docs:
-	$(ECHO) "Documenation is not yet available"
-	@false
-
-.PHONY: libs
-libs: $(OBJ_DIR) $(LIB_DIR) $(STATIC_LIB)
-
-.PHONY: lib_install
-lib_install: libs
-	$(Q)install -d $(DESTDIR)/lib
-	$(Q)install -m 0644 ${STATIC_LIB} $(DESTDIR)/lib/
-
-.PHONY: headers_install
-headers_install: libs
-	$(ECHO) Installing headers to $(DESTDIR)/include
-	$(Q)$(SYNC) $(ODP_ROOT)/include $(DESTDIR)
-	$(Q)$(SYNC) $(LINUX_GENERIC_DIR)/include/api/* $(DESTDIR)/include/
-	$(Q)-$(SYNC) include/api/* $(DESTDIR)/include/
-
-install: lib_install headers_install
diff --git a/platform/linux-keystone2/source/odp_buffer.c b/platform/linux-keystone2/odp_buffer.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_buffer.c
rename to platform/linux-keystone2/odp_buffer.c
diff --git a/platform/linux-keystone2/source/odp_buffer_pool.c b/platform/linux-keystone2/odp_buffer_pool.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_buffer_pool.c
rename to platform/linux-keystone2/odp_buffer_pool.c
diff --git a/platform/linux-keystone2/source/odp_init.c b/platform/linux-keystone2/odp_init.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_init.c
rename to platform/linux-keystone2/odp_init.c
diff --git a/platform/linux-keystone2/source/odp_packet.c b/platform/linux-keystone2/odp_packet.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_packet.c
rename to platform/linux-keystone2/odp_packet.c
diff --git a/platform/linux-keystone2/source/odp_packet_io.c b/platform/linux-keystone2/odp_packet_io.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_packet_io.c
rename to platform/linux-keystone2/odp_packet_io.c
diff --git a/platform/linux-keystone2/source/odp_queue.c b/platform/linux-keystone2/odp_queue.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_queue.c
rename to platform/linux-keystone2/odp_queue.c
diff --git a/platform/linux-keystone2/source/odp_shared_memory.c b/platform/linux-keystone2/odp_shared_memory.c
similarity index 100%
rename from platform/linux-keystone2/source/odp_shared_memory.c
rename to platform/linux-keystone2/odp_shared_memory.c
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 879d775..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:	BSD-3-Clause
-
-TESTS=$(filter %, $(wildcard */))
-
-.PHONY: all clean install
-
-all: $(TESTS)
-	$(Q)for T in $(TESTS); do $(MAKE) -C $$T || exit 1; done
-
-clean:
-	$(Q)for T in $(TESTS); do $(MAKE) -C $$T clean || true; done
-
-install:
-	$(Q)for T in $(TESTS); do $(MAKE) -C $$T install ||exit 1; done
diff --git a/test/Makefile.inc b/test/Makefile.inc
deleted file mode 100644
index 8536402..0000000
--- a/test/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:	BSD-3-Clause
-
-ODP_LIB = $(DESTDIR)/lib/libodp.a
-EXTRA_CFLAGS += -I$(DESTDIR)/include
diff --git a/test/api_test/Makefile b/test/api_test/Makefile
deleted file mode 100644
index 55a81ed..0000000
--- a/test/api_test/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-
-#
-# API testing stuffs
-#
-ODP_ATOMIC    = odp_atomic
-ODP_SHM       = odp_shm
-ODP_RING      = odp_ring
-ODP_TIM       = odp_timer
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-.PHONY: default
-default: all
-
-EXTRA_CFLAGS  += -I.
-
-ATOMIC_OBJS  =
-ATOMIC_OBJS += $(OBJ_DIR)/odp_common.o
-ATOMIC_OBJS += $(OBJ_DIR)/odp_atomic_test.o
-
-SHM_OBJS  =
-SHM_OBJS += $(OBJ_DIR)/odp_common.o
-SHM_OBJS += $(OBJ_DIR)/odp_shm_test.o
-
-RING_OBJS  =
-RING_OBJS += $(OBJ_DIR)/odp_common.o
-RING_OBJS += $(OBJ_DIR)/odp_ring_test.o
-
-TIM_OBJS   =
-TIM_OBJS  += $(OBJ_DIR)/odp_common.o
-TIM_OBJS  += $(OBJ_DIR)/odp_timer_ping.o
-
-DEPS     = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) $(TIM_OBJS:.o=.d)
-
-.PHONY: all
-all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM)
-atomic: $(OBJ_DIR) $(ODP_ATOMIC)
-shm: $(OBJ_DIR) $(ODP_SHM)
-ring: $(OBJ_DIR) $(ODP_RING)
-timer: $(OBJ_DIR) $(ODP_TIM)
-
--include $(DEPS)
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_ATOMIC): $(ODP_LIB) $(ATOMIC_OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(ATOMIC_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-$(ODP_SHM): $(ODP_LIB) $(SHM_OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(SHM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-$(ODP_RING): $(ODP_LIB) $(RING_OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_ATOMIC)
-	$(Q)$(RM) $(ODP_SHM)
-	$(Q)$(RM) $(ODP_RING)
-	$(Q)$(RM) $(ODP_TIM)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/
-	install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/
-	install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/
-	install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/
diff --git a/test/example/Makefile b/test/example/Makefile
deleted file mode 100644
index 266de6f..0000000
--- a/test/example/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-ODP_APP  = odp_example
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-.PHONY: default
-default: $(OBJ_DIR) $(ODP_APP)
-
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_example.o
-
-DEPS     = $(OBJS:.o=.d)
-
--include $(DEPS)
-
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_APP): $(ODP_LIB) $(OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_APP)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)/share/odp/
diff --git a/test/generator/Makefile b/test/generator/Makefile
deleted file mode 100644
index 11ab30f..0000000
--- a/test/generator/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@ 
-# Copyright (c) 2014, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-ODP_APP  = odp_generator
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-.PHONY: default
-default: $(OBJ_DIR) $(ODP_APP)
-
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_generator.o
-
-DEPS     = $(OBJS:.o=.d)
-
--include $(DEPS)
-
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_APP): $(ODP_LIB) $(OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_APP)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)/share/odp/
diff --git a/test/l2fwd/Makefile b/test/l2fwd/Makefile
deleted file mode 100644
index 9b956e9..0000000
--- a/test/l2fwd/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@ 
-# Copyright (c) 2014, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-ODP_APP  = odp_l2fwd
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-OBJS     =
-OBJS    += $(OBJ_DIR)/l2fwd.o
-
-DEPS     = $(OBJS:.o=.d)
-
-.PHONY: default
-default: $(OBJ_DIR) $(ODP_APP)
-
--include $(DEPS)
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_APP): $(ODP_LIB) $(OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_APP)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)/share/odp/
diff --git a/test/packet/Makefile b/test/packet/Makefile
deleted file mode 100644
index d3c3e02..0000000
--- a/test/packet/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-ODP_APP  = odp_packet
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_example_pktio.o
-
-DEPS     = $(OBJS:.o=.d)
-
-.PHONY: default
-default: $(OBJ_DIR) $(ODP_APP)
-
--include $(DEPS)
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_APP): $(ODP_LIB) $(OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_APP)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)/share/odp/
diff --git a/test/packet_netmap/Makefile b/test/packet_netmap/Makefile
deleted file mode 100644
index 1e5cfa5..0000000
--- a/test/packet_netmap/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-ODP_APP  = odp_packet_netmap
-
-EXTRA_CFLAGS  += -DODP_HAVE_NETMAP
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_example_pktio_netmap.o
-
-DEPS     = $(OBJS:.o=.d)
-
-.PHONY: default
-default: $(OBJ_DIR) $(ODP_APP)
-
--include $(DEPS)
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_APP): $(ODP_LIB) $(OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_APP)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)/share/odp/
diff --git a/test/timer/Makefile b/test/timer/Makefile
deleted file mode 100644
index effaf54..0000000
--- a/test/timer/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@ 
-# Copyright (c) 2013, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-
-ODP_ROOT = ../..
-ODP_APP  = odp_timer_test
-
-include $(ODP_ROOT)/Makefile.inc
-include ../Makefile.inc
-
-.PHONY: default
-default: $(OBJ_DIR) $(ODP_APP)
-
-OBJS     =
-OBJS    += $(OBJ_DIR)/odp_timer_test.o
-
-DEPS     = $(OBJS:.o=.d)
-
--include $(DEPS)
-
-
-#
-# Compile rules
-#
-$(OBJ_DIR)/%.o: %.c
-	$(QUIET_CC)$(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
-
-#
-# Link rule
-#
-$(ODP_APP): $(ODP_LIB) $(OBJS)
-	$(QUIET_LD)$(CC) $(LDFLAGS) $(OBJS) $(ODP_LIB) $(STD_LIBS) -o $@
-
-.PHONY: clean
-clean:
-	$(Q)$(RMDIR) $(OBJ_DIR)
-	$(Q)$(RM) $(ODP_APP)
-	$(MAKE) -C $(ODP_DIR) clean
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)/share/odp/