reorganize makefile

Reorganize source file folder, clean up Makefiles,
rename odp.a to libodp.a, install to /usr/local by default

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

36 files changed, 55 insertions, 137 deletions

diff --git a/Makefile b/Makefile
index 31261e14c..84022f328 100644
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,11 @@
 .DEFAULT_GOAL := default
 
 ODP_ROOT = .
-ARCH     = linux-generic
-ODP_LIB  = $(ODP_ROOT)/arch/$(ARCH)
-OBJ_DIR  = ./obj
-LIB      = $(ODP_LIB)/lib/odp.a
 ODP_APP  = odp_app
 ODP_TESTS = $(ODP_ROOT)/test
 INCLUDE  = -I$(ODP_ROOT)/include
-CC       ?= @gcc
 
-ifeq ($(ODP_DEBUG), 1)
-export ODP_DEBUG=1
-else
-export ODP_DEBUG=0
-endif
-
-ifeq ($(ODP_EXAMPLE_DEBUG), 0)
-export ODP_EXAMPLE_DEBUG=0
-else
-export ODP_EXAMPLE_DEBUG=1
-endif
+include $(ODP_ROOT)/Makefile.inc
 
 .PHONY: default
 default: libs tests
@@ -52,4 +37,5 @@ clean:
 
 .PHONY: install
 install:
+	$(MAKE) -C patform/$(platform) install
 	$(MAKE) -C test install
diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 000000000..2a6629bab
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,25 @@
+# Copyright (c) 2013, Linaro Limited
+# All rights reserved.
+#
+# SPDX-License-Identifier:	BSD-3-Clause
+
+PLATFORM ?= linux-generic
+CFLAGS  += -DODP_DEBUG=1
+CFLAGS  += -O3
+
+OBJ_DIR  = ./obj
+ODP_LIB  = $(ODP_ROOT)/platform/$(PLATFORM)
+LIB      = -L$(ODP_LIB)/lib -lodp
+
+CFLAGS += -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
+CFLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
+CFLAGS += -Wformat-security -Wundef -Wwrite-strings
+CFLAGS += -I$(ODP_ROOT)/include
+
+CC       ?= @gcc
+LD       ?= gcc
+AR       ?= ar
+
+CFLAGS  += -pthread
+LDFLAGS += -pthread
diff --git a/arch/linux-generic/Doxyfile.in b/platform/linux-generic/Doxyfile.in
index 421e7ac45..421e7ac45 100644
--- a/arch/linux-generic/Doxyfile.in
+++ b/platform/linux-generic/Doxyfile.in
diff --git a/arch/linux-generic/Makefile b/platform/linux-generic/Makefile
index d36f7a7ad..080458603 100644
--- a/arch/linux-generic/Makefile
+++ b/platform/linux-generic/Makefile
@@ -29,32 +29,13 @@
 .DEFAULT_GOAL := libs
 
 ODP_ROOT = ../..
-ARCH     = linux-generic
-OBJ_DIR  = ./obj
 LIB_DIR  = ./lib
 DOC_DIR  = ./doc
-INC_DIR  = $(ODP_ROOT)/include
-LIB      = $(LIB_DIR)/odp.a
-
-CC       ?= @gcc
-LD       = gcc
-AR       = ar
-
-E_FLAGS  = -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-E_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-E_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
-E_FLAGS += -Wformat-security -Wundef -Wwrite-strings
-
-CFLAGS   =
-#CFLAGS += -O0 -g
-CFLAGS  += -O3
-CFLAGS  += -pthread
-CFLAGS  += -I.
-CFLAGS  += -I./source
-CFLAGS  += -I$(INC_DIR)
-CFLAGS  += $(E_FLAGS)
-CFLAGS  += $(EXTRA_CFLAGS)
-CFLAGS  += -DODP_DEBUG=$(ODP_DEBUG)
+
+CFLAGS  += -I./include  -I./include/api
+
+include $(ODP_ROOT)/Makefile.inc
+STATIC_LIB = $(ODP_LIB)/lib/libodp.a
 
 #
 # Object files
@@ -107,7 +88,7 @@ $(OBJ_DIR)/%.o: ./source/%.c
 #
 # Lib rule
 #
-$(LIB): $(OBJS)
+$(STATIC_LIB): $(OBJS)
 	$(AR) -cr $@ $(OBJS)
 
 clean:
@@ -120,7 +101,7 @@ Doxyfile: Doxyfile.in
 	doxygen -u - < $< > $@
 
 .PHONY: docs
-docs: $(DOC_DIR) Doxyfile $(INC_DIR)/odp*.h
+docs: $(DOC_DIR) Doxyfile ./include/odp*.h
 	doxygen
 
 .PHONY: pdf
@@ -128,4 +109,9 @@ pdf: docs
 	make --directory doc/latex refman.pdf 1> /dev/null
 
 .PHONY: libs
-libs: $(OBJ_DIR) $(LIB_DIR) $(LIB)
+libs: $(OBJ_DIR) $(LIB_DIR) $(STATIC_LIB)
+
+.PHONY: install
+install:
+	install -d $(DESTDIR)$(prefix)/usr/local/lib
+	install -m 0644 ${STATIC_LIB} $(DESTDIR)$(prefix)/usr/local/lib/
diff --git a/arch/linux-generic/source/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index f14738409..f14738409 100644
--- a/arch/linux-generic/source/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
diff --git a/arch/linux-generic/source/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index cfd19c948..cfd19c948 100644
--- a/arch/linux-generic/source/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
diff --git a/arch/linux-generic/source/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 034162fb2..034162fb2 100644
--- a/arch/linux-generic/source/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
diff --git a/arch/linux-generic/source/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index 08a2d052a..08a2d052a 100644
--- a/arch/linux-generic/source/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
diff --git a/arch/linux-generic/source/odp_packet_io_queue.h b/platform/linux-generic/include/odp_packet_io_queue.h
index 58d69611e..58d69611e 100644
--- a/arch/linux-generic/source/odp_packet_io_queue.h
+++ b/platform/linux-generic/include/odp_packet_io_queue.h
diff --git a/arch/linux-generic/source/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h
index e2b48f904..e2b48f904 100644
--- a/arch/linux-generic/source/odp_packet_socket.h
+++ b/platform/linux-generic/include/odp_packet_socket.h
diff --git a/arch/linux-generic/source/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h
index 6d6700a60..6d6700a60 100644
--- a/arch/linux-generic/source/odp_queue_internal.h
+++ b/platform/linux-generic/include/odp_queue_internal.h
diff --git a/arch/linux-generic/source/odp_schedule_internal.h b/platform/linux-generic/include/odp_schedule_internal.h
index bd0ec27bb..bd0ec27bb 100644
--- a/arch/linux-generic/source/odp_schedule_internal.h
+++ b/platform/linux-generic/include/odp_schedule_internal.h
diff --git a/arch/linux-generic/source/odp_spin_internal.h b/platform/linux-generic/include/odp_spin_internal.h
index e70ccf166..e70ccf166 100644
--- a/arch/linux-generic/source/odp_spin_internal.h
+++ b/platform/linux-generic/include/odp_spin_internal.h
diff --git a/arch/linux-generic/source/odp_barrier.c b/platform/linux-generic/source/odp_barrier.c
index 64fbdb9a3..64fbdb9a3 100644
--- a/arch/linux-generic/source/odp_barrier.c
+++ b/platform/linux-generic/source/odp_barrier.c
diff --git a/arch/linux-generic/source/odp_buffer.c b/platform/linux-generic/source/odp_buffer.c
index 1451b862c..1451b862c 100644
--- a/arch/linux-generic/source/odp_buffer.c
+++ b/platform/linux-generic/source/odp_buffer.c
diff --git a/arch/linux-generic/source/odp_buffer_pool.c b/platform/linux-generic/source/odp_buffer_pool.c
index ab9b07c76..ab9b07c76 100644
--- a/arch/linux-generic/source/odp_buffer_pool.c
+++ b/platform/linux-generic/source/odp_buffer_pool.c
diff --git a/arch/linux-generic/source/odp_coremask.c b/platform/linux-generic/source/odp_coremask.c
index 50f303e60..50f303e60 100644
--- a/arch/linux-generic/source/odp_coremask.c
+++ b/platform/linux-generic/source/odp_coremask.c
diff --git a/arch/linux-generic/source/odp_init.c b/platform/linux-generic/source/odp_init.c
index f56bc2c00..f56bc2c00 100644
--- a/arch/linux-generic/source/odp_init.c
+++ b/platform/linux-generic/source/odp_init.c
diff --git a/arch/linux-generic/source/odp_linux.c b/platform/linux-generic/source/odp_linux.c
index 42b7d8925..42b7d8925 100644
--- a/arch/linux-generic/source/odp_linux.c
+++ b/platform/linux-generic/source/odp_linux.c
diff --git a/arch/linux-generic/source/odp_packet.c b/platform/linux-generic/source/odp_packet.c
index 7cd0d7199..7cd0d7199 100644
--- a/arch/linux-generic/source/odp_packet.c
+++ b/platform/linux-generic/source/odp_packet.c
diff --git a/arch/linux-generic/source/odp_packet_io.c b/platform/linux-generic/source/odp_packet_io.c
index e14f4d692..e14f4d692 100644
--- a/arch/linux-generic/source/odp_packet_io.c
+++ b/platform/linux-generic/source/odp_packet_io.c
diff --git a/arch/linux-generic/source/odp_packet_socket.c b/platform/linux-generic/source/odp_packet_socket.c
index c41e25540..c41e25540 100644
--- a/arch/linux-generic/source/odp_packet_socket.c
+++ b/platform/linux-generic/source/odp_packet_socket.c
diff --git a/arch/linux-generic/source/odp_queue.c b/platform/linux-generic/source/odp_queue.c
index d770918dc..d770918dc 100644
--- a/arch/linux-generic/source/odp_queue.c
+++ b/platform/linux-generic/source/odp_queue.c
diff --git a/arch/linux-generic/source/odp_ring.c b/platform/linux-generic/source/odp_ring.c
index fed30e1d1..fed30e1d1 100644
--- a/arch/linux-generic/source/odp_ring.c
+++ b/platform/linux-generic/source/odp_ring.c
diff --git a/arch/linux-generic/source/odp_rwlock.c b/platform/linux-generic/source/odp_rwlock.c
index 19c58e155..19c58e155 100644
--- a/arch/linux-generic/source/odp_rwlock.c
+++ b/platform/linux-generic/source/odp_rwlock.c
diff --git a/arch/linux-generic/source/odp_schedule.c b/platform/linux-generic/source/odp_schedule.c
index df76272c2..df76272c2 100644
--- a/arch/linux-generic/source/odp_schedule.c
+++ b/platform/linux-generic/source/odp_schedule.c
diff --git a/arch/linux-generic/source/odp_shared_memory.c b/platform/linux-generic/source/odp_shared_memory.c
index 097b2e837..097b2e837 100644
--- a/arch/linux-generic/source/odp_shared_memory.c
+++ b/platform/linux-generic/source/odp_shared_memory.c
diff --git a/arch/linux-generic/source/odp_spinlock.c b/platform/linux-generic/source/odp_spinlock.c
index da98278bd..da98278bd 100644
--- a/arch/linux-generic/source/odp_spinlock.c
+++ b/platform/linux-generic/source/odp_spinlock.c
diff --git a/arch/linux-generic/source/odp_system_info.c b/platform/linux-generic/source/odp_system_info.c
index 1727f26e0..1727f26e0 100644
--- a/arch/linux-generic/source/odp_system_info.c
+++ b/platform/linux-generic/source/odp_system_info.c
diff --git a/arch/linux-generic/source/odp_thread.c b/platform/linux-generic/source/odp_thread.c
index 4bee2aafd..4bee2aafd 100644
--- a/arch/linux-generic/source/odp_thread.c
+++ b/platform/linux-generic/source/odp_thread.c
diff --git a/arch/linux-generic/source/odp_ticketlock.c b/platform/linux-generic/source/odp_ticketlock.c
index be5b88511..be5b88511 100644
--- a/arch/linux-generic/source/odp_ticketlock.c
+++ b/platform/linux-generic/source/odp_ticketlock.c
diff --git a/arch/linux-generic/source/odp_time.c b/platform/linux-generic/source/odp_time.c
index 38c1bdf02..38c1bdf02 100644
--- a/arch/linux-generic/source/odp_time.c
+++ b/platform/linux-generic/source/odp_time.c
diff --git a/test/Makefile b/test/Makefile
index b40f55822..6cead72c3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,14 +3,6 @@
 #
 # SPDX-License-Identifier:	BSD-3-Clause
 
-
-E_FLAGS  = -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-E_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-E_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
-E_FLAGS += -Wformat-security -Wundef -Wwrite-strings
-
-CFLAGS  += $(E_FLAGS)
-
 .PHONY: all
 all:
 	 $(MAKE) -C api_test
diff --git a/test/api_test/Makefile b/test/api_test/Makefile
index aff8cf2df..58cd5c7fa 100644
--- a/test/api_test/Makefile
+++ b/test/api_test/Makefile
@@ -4,13 +4,6 @@
 # SPDX-License-Identifier:     BSD-3-Clause
 
 ODP_ROOT = ../..
-ARCH     = linux-generic
-ODP_LIB  = $(ODP_ROOT)/arch/$(ARCH)
-OBJ_DIR  = ./obj
-LIB      = $(ODP_LIB)/lib/odp.a
-
-INCLUDE  = -I$(ODP_ROOT)/include
-CC       ?= @gcc
 
 #
 # API testing stuffs
@@ -19,26 +12,12 @@ ODP_ATOMIC    = odp_atomic
 ODP_SHM       = odp_shm
 ODP_RING      = odp_ring
 
-E_FLAGS  = -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-E_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-E_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
-E_FLAGS += -Wformat-security -Wundef -Wwrite-strings
-
-CFLAGS  += -pthread
 CFLAGS  += -I.
 CFLAGS  += -I$(ODP_LIB)
-CFLAGS  += $(E_FLAGS)
-CFLAGS  += $(INCLUDE)
-CFLAGS  += $(EXTRA_CFLAGS)
 #CFLAGS  += -DODP_TEST_ATOMIC
-#Debug turned on per default
-ifeq ($(ODP_EXAMPLE_DEBUG), 0)
-CFLAGS  += -DODP_DEBUG=0
-else
-CFLAGS  += -DODP_DEBUG=1
-endif
-
-LDFLAGS += -pthread
+
+include $(ODP_ROOT)/Makefile.inc
+
 LDFLAGS += -lrt
 LDFLAGS += $(EXTRA_CFLAGS)
 
@@ -108,9 +87,7 @@ clean:
 
 .PHONY: install
 install:
-	install -d $(DESTDIR)$(prefix)/lib
-	install -m 0644 ${LIB} $(DESTDIR)$(prefix)/lib/
-	install -d $(DESTDIR)$(prefix)/share/odp
-	install -m 0755 $(ODP_ATOMIC) $(DESTDIR)$(prefix)/share/odp/
-	install -m 0755 $(ODP_SHM) $(DESTDIR)$(prefix)/share/odp/
-	install -m 0755 $(ODP_RING) $(DESTDIR)$(prefix)/share/odp/
+	install -d $(DESTDIR)$(prefix)/usr/local/share/odp
+	install -m 0755 $(ODP_ATOMIC) $(DESTDIR)$(prefix)/usr/local/share/odp/
+	install -m 0755 $(ODP_SHM) $(DESTDIR)$(prefix)/usr/local/share/odp/
+	install -m 0755 $(ODP_RING) $(DESTDIR)$(prefix)/usr/local/share/odp/
diff --git a/test/example/Makefile b/test/example/Makefile
index 4363cc276..a21ba063d 100644
--- a/test/example/Makefile
+++ b/test/example/Makefile
@@ -4,34 +4,12 @@
 # SPDX-License-Identifier:     BSD-3-Clause
 
 ODP_ROOT = ../..
-ARCH     = linux-generic
-ODP_LIB  = $(ODP_ROOT)/arch/$(ARCH)
-ODP_INC  = $(ODP_ROOT)/include
-OBJ_DIR  = ./obj
-LIB      = $(ODP_LIB)/lib/odp.a
 ODP_APP  = odp_example
 
-CC       ?= @gcc
+CFLAGS  += -I.
 
-E_FLAGS  = -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-E_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-E_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
-E_FLAGS += -Wformat-security -Wundef -Wwrite-strings
+include $(ODP_ROOT)/Makefile.inc
 
-CFLAGS  += -O3
-CFLAGS  += -pthread
-CFLAGS  += -I.
-CFLAGS  += -I$(ODP_INC)
-CFLAGS  += $(E_FLAGS)
-CFLAGS  += $(EXTRA_CFLAGS)
-#Debug turned on per default
-ifeq ($(ODP_EXAMPLE_DEBUG), 0)
-CFLAGS  += -DODP_DEBUG=0
-else
-CFLAGS  += -DODP_DEBUG=1
-endif
-
-LDFLAGS += -pthread
 LDFLAGS += -lrt
 LDFLAGS += $(EXTRA_CFLAGS)
 
@@ -81,7 +59,5 @@ clean:
 
 .PHONY: install
 install:
-	install -d $(DESTDIR)$(prefix)/lib
-	install -m 0644 ${LIB} $(DESTDIR)$(prefix)/lib/
-	install -d $(DESTDIR)$(prefix)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)$(prefix)/share/odp/
+	install -d $(DESTDIR)$(prefix)/usr/local/share/odp
+	install -m 0755 $(ODP_APP) $(DESTDIR)$(prefix)/usr/local/share/odp/
diff --git a/test/packet/Makefile b/test/packet/Makefile
index 5cdabb4d0..db7f6e2bb 100644
--- a/test/packet/Makefile
+++ b/test/packet/Makefile
@@ -4,34 +4,12 @@
 # SPDX-License-Identifier:     BSD-3-Clause
 
 ODP_ROOT = ../..
-ARCH     = linux-generic
-ODP_LIB  = $(ODP_ROOT)/arch/$(ARCH)
-ODP_INC  = $(ODP_ROOT)/include
-OBJ_DIR  = ./obj
-LIB      = $(ODP_LIB)/lib/odp.a
 ODP_APP  = odp_packet
 
-CC       ?= @gcc
+CFLAGS  += -I.
 
-E_FLAGS  = -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-E_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-E_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral
-E_FLAGS += -Wformat-security -Wundef -Wwrite-strings
+include $(ODP_ROOT)/Makefile.inc
 
-CFLAGS  += -O3
-CFLAGS  += -pthread
-CFLAGS  += -I.
-CFLAGS  += -I$(ODP_INC)
-CFLAGS  += $(E_FLAGS)
-CFLAGS  += $(EXTRA_CFLAGS)
-#Debug turned on per default
-ifeq ($(ODP_EXAMPLE_DEBUG), 0)
-CFLAGS  += -DODP_DEBUG=0
-else
-CFLAGS  += -DODP_DEBUG=1
-endif
-
-LDFLAGS += -pthread
 LDFLAGS += -lrt
 LDFLAGS += $(EXTRA_CFLAGS)
 
@@ -81,7 +59,5 @@ clean:
 
 .PHONY: install
 install:
-	install -d $(DESTDIR)$(prefix)/lib
-	install -m 0644 ${LIB} $(DESTDIR)$(prefix)/lib/
-	install -d $(DESTDIR)$(prefix)/share/odp
-	install -m 0755 $(ODP_APP) $(DESTDIR)$(prefix)/share/odp/
+	install -d $(DESTDIR)$(prefix)/usr/local/share/odp
+	install -m 0755 $(ODP_APP) $(DESTDIR)$(prefix)/usr/local/share/odp/