From 0a5ba968378fa58bab976e554808b48ec13811d7 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 27 Sep 2012 04:02:37 +0000 Subject: [PATCH] move eina headers into lib/eina like the rest of efl - at least be consistent with the majority. SVN revision: 77119 --- configure.ac | 4 +- src/include/Makefile.am | 3 - src/include/eina/Makefile.am | 93 ------------------- src/{include => lib}/eina/Eina.h | 0 src/lib/eina/Makefile.am | 91 ++++++++++++++++++ src/{include => lib}/eina/eina_accessor.h | 0 src/{include => lib}/eina/eina_array.h | 0 src/{include => lib}/eina/eina_benchmark.h | 0 src/{include => lib}/eina/eina_binbuf.h | 0 src/{include => lib}/eina/eina_binshare.h | 0 src/{include => lib}/eina/eina_clist.h | 0 src/{include => lib}/eina/eina_config.h.in | 0 src/{include => lib}/eina/eina_convert.h | 0 src/{include => lib}/eina/eina_counter.h | 0 src/{include => lib}/eina/eina_cpu.h | 0 src/{include => lib}/eina/eina_error.h | 0 src/{include => lib}/eina/eina_file.h | 0 src/{include => lib}/eina/eina_fp.h | 0 src/{include => lib}/eina/eina_hamster.h | 0 src/{include => lib}/eina/eina_hash.h | 0 src/{include => lib}/eina/eina_inarray.h | 0 src/{include => lib}/eina/eina_inline_array.x | 0 src/{include => lib}/eina/eina_inline_clist.x | 0 .../eina/eina_inline_f16p16.x | 0 .../eina/eina_inline_f32p32.x | 0 src/{include => lib}/eina/eina_inline_f8p24.x | 0 src/{include => lib}/eina/eina_inline_fp.x | 0 src/{include => lib}/eina/eina_inline_hash.x | 0 src/{include => lib}/eina/eina_inline_list.x | 0 .../eina/eina_inline_lock_posix.x | 0 .../eina/eina_inline_lock_void.x | 0 .../eina/eina_inline_lock_win32.x | 0 .../eina/eina_inline_lock_wince.x | 0 src/{include => lib}/eina/eina_inline_log.x | 0 .../eina/eina_inline_mempool.x | 0 .../eina/eina_inline_rbtree.x | 0 .../eina/eina_inline_rectangle.x | 0 src/{include => lib}/eina/eina_inline_str.x | 0 .../eina/eina_inline_stringshare.x | 0 src/{include => lib}/eina/eina_inline_tiler.x | 0 src/{include => lib}/eina/eina_inline_trash.x | 0 .../eina/eina_inline_ustringshare.x | 0 src/{include => lib}/eina/eina_inline_value.x | 0 src/{include => lib}/eina/eina_inlist.h | 0 src/{include => lib}/eina/eina_iterator.h | 0 src/{include => lib}/eina/eina_lalloc.h | 0 src/{include => lib}/eina/eina_list.h | 0 src/{include => lib}/eina/eina_lock.h | 0 src/{include => lib}/eina/eina_log.h | 0 src/{include => lib}/eina/eina_magic.h | 0 src/{include => lib}/eina/eina_main.h | 0 src/{include => lib}/eina/eina_matrixsparse.h | 0 src/{include => lib}/eina/eina_mempool.h | 0 src/{include => lib}/eina/eina_mmap.h | 0 src/{include => lib}/eina/eina_model.h | 0 src/{include => lib}/eina/eina_module.h | 0 src/{include => lib}/eina/eina_object.h | 0 src/{include => lib}/eina/eina_prefix.h | 0 src/{include => lib}/eina/eina_quadtree.h | 0 src/{include => lib}/eina/eina_rbtree.h | 0 src/{include => lib}/eina/eina_rectangle.h | 0 src/{include => lib}/eina/eina_refcount.h | 0 .../eina/eina_safety_checks.h | 0 src/{include => lib}/eina/eina_sched.h | 0 .../eina/eina_simple_xml_parser.h | 0 src/{include => lib}/eina/eina_str.h | 0 src/{include => lib}/eina/eina_strbuf.h | 0 src/{include => lib}/eina/eina_stringshare.h | 0 src/{include => lib}/eina/eina_tiler.h | 0 src/{include => lib}/eina/eina_trash.h | 0 src/{include => lib}/eina/eina_types.h | 0 src/{include => lib}/eina/eina_unicode.h | 0 src/{include => lib}/eina/eina_ustrbuf.h | 0 src/{include => lib}/eina/eina_ustringshare.h | 0 src/{include => lib}/eina/eina_value.h | 0 src/{include => lib}/eina/eina_xattr.h | 0 76 files changed, 92 insertions(+), 99 deletions(-) delete mode 100644 src/include/Makefile.am delete mode 100644 src/include/eina/Makefile.am rename src/{include => lib}/eina/Eina.h (100%) rename src/{include => lib}/eina/eina_accessor.h (100%) rename src/{include => lib}/eina/eina_array.h (100%) rename src/{include => lib}/eina/eina_benchmark.h (100%) rename src/{include => lib}/eina/eina_binbuf.h (100%) rename src/{include => lib}/eina/eina_binshare.h (100%) rename src/{include => lib}/eina/eina_clist.h (100%) rename src/{include => lib}/eina/eina_config.h.in (100%) rename src/{include => lib}/eina/eina_convert.h (100%) rename src/{include => lib}/eina/eina_counter.h (100%) rename src/{include => lib}/eina/eina_cpu.h (100%) rename src/{include => lib}/eina/eina_error.h (100%) rename src/{include => lib}/eina/eina_file.h (100%) rename src/{include => lib}/eina/eina_fp.h (100%) rename src/{include => lib}/eina/eina_hamster.h (100%) rename src/{include => lib}/eina/eina_hash.h (100%) rename src/{include => lib}/eina/eina_inarray.h (100%) rename src/{include => lib}/eina/eina_inline_array.x (100%) rename src/{include => lib}/eina/eina_inline_clist.x (100%) rename src/{include => lib}/eina/eina_inline_f16p16.x (100%) rename src/{include => lib}/eina/eina_inline_f32p32.x (100%) rename src/{include => lib}/eina/eina_inline_f8p24.x (100%) rename src/{include => lib}/eina/eina_inline_fp.x (100%) rename src/{include => lib}/eina/eina_inline_hash.x (100%) rename src/{include => lib}/eina/eina_inline_list.x (100%) rename src/{include => lib}/eina/eina_inline_lock_posix.x (100%) rename src/{include => lib}/eina/eina_inline_lock_void.x (100%) rename src/{include => lib}/eina/eina_inline_lock_win32.x (100%) rename src/{include => lib}/eina/eina_inline_lock_wince.x (100%) rename src/{include => lib}/eina/eina_inline_log.x (100%) rename src/{include => lib}/eina/eina_inline_mempool.x (100%) rename src/{include => lib}/eina/eina_inline_rbtree.x (100%) rename src/{include => lib}/eina/eina_inline_rectangle.x (100%) rename src/{include => lib}/eina/eina_inline_str.x (100%) rename src/{include => lib}/eina/eina_inline_stringshare.x (100%) rename src/{include => lib}/eina/eina_inline_tiler.x (100%) rename src/{include => lib}/eina/eina_inline_trash.x (100%) rename src/{include => lib}/eina/eina_inline_ustringshare.x (100%) rename src/{include => lib}/eina/eina_inline_value.x (100%) rename src/{include => lib}/eina/eina_inlist.h (100%) rename src/{include => lib}/eina/eina_iterator.h (100%) rename src/{include => lib}/eina/eina_lalloc.h (100%) rename src/{include => lib}/eina/eina_list.h (100%) rename src/{include => lib}/eina/eina_lock.h (100%) rename src/{include => lib}/eina/eina_log.h (100%) rename src/{include => lib}/eina/eina_magic.h (100%) rename src/{include => lib}/eina/eina_main.h (100%) rename src/{include => lib}/eina/eina_matrixsparse.h (100%) rename src/{include => lib}/eina/eina_mempool.h (100%) rename src/{include => lib}/eina/eina_mmap.h (100%) rename src/{include => lib}/eina/eina_model.h (100%) rename src/{include => lib}/eina/eina_module.h (100%) rename src/{include => lib}/eina/eina_object.h (100%) rename src/{include => lib}/eina/eina_prefix.h (100%) rename src/{include => lib}/eina/eina_quadtree.h (100%) rename src/{include => lib}/eina/eina_rbtree.h (100%) rename src/{include => lib}/eina/eina_rectangle.h (100%) rename src/{include => lib}/eina/eina_refcount.h (100%) rename src/{include => lib}/eina/eina_safety_checks.h (100%) rename src/{include => lib}/eina/eina_sched.h (100%) rename src/{include => lib}/eina/eina_simple_xml_parser.h (100%) rename src/{include => lib}/eina/eina_str.h (100%) rename src/{include => lib}/eina/eina_strbuf.h (100%) rename src/{include => lib}/eina/eina_stringshare.h (100%) rename src/{include => lib}/eina/eina_tiler.h (100%) rename src/{include => lib}/eina/eina_trash.h (100%) rename src/{include => lib}/eina/eina_types.h (100%) rename src/{include => lib}/eina/eina_unicode.h (100%) rename src/{include => lib}/eina/eina_ustrbuf.h (100%) rename src/{include => lib}/eina/eina_ustringshare.h (100%) rename src/{include => lib}/eina/eina_value.h (100%) rename src/{include => lib}/eina/eina_xattr.h (100%) diff --git a/configure.ac b/configure.ac index d6b1aefccd..a065c005b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1235,12 +1235,10 @@ src/examples/Makefile src/examples/eina/Makefile src/examples/eet/Makefile src/examples/eo/Makefile -src/include/Makefile -src/include/eina/Makefile -src/include/eina/eina_config.h src/lib/Makefile src/lib/evil/Makefile src/lib/eina/Makefile +src/lib/eina/eina_config.h src/lib/eet/Makefile src/lib/eo/Makefile src/modules/Makefile diff --git a/src/include/Makefile.am b/src/include/Makefile.am deleted file mode 100644 index b8f642fb72..0000000000 --- a/src/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = eina diff --git a/src/include/eina/Makefile.am b/src/include/eina/Makefile.am deleted file mode 100644 index ef87ce05a6..0000000000 --- a/src/include/eina/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EINAHEADERS = \ -eina_safety_checks.h \ -eina_error.h \ -eina_log.h \ -eina_inline_log.x \ -eina_fp.h \ -eina_inline_f32p32.x \ -eina_inline_f16p16.x \ -eina_inline_f8p24.x \ -eina_inline_fp.x \ -eina_hash.h \ -eina_inline_hash.x \ -eina_lalloc.h \ -eina_clist.h \ -eina_inline_clist.x \ -eina_inarray.h \ -eina_inlist.h \ -eina_list.h \ -eina_file.h \ -eina_mempool.h \ -eina_module.h \ -eina_rectangle.h \ -eina_types.h \ -eina_array.h \ -eina_counter.h \ -eina_inline_array.x \ -eina_magic.h \ -eina_stringshare.h \ -eina_binshare.h \ -eina_binbuf.h \ -eina_ustringshare.h \ -eina_inline_stringshare.x \ -eina_inline_ustringshare.x \ -eina_inline_list.x \ -eina_accessor.h \ -eina_convert.h \ -eina_rbtree.h \ -eina_benchmark.h \ -eina_inline_rbtree.x \ -eina_inline_mempool.x \ -eina_inline_rectangle.x \ -eina_inline_trash.x \ -eina_trash.h \ -eina_iterator.h \ -eina_main.h \ -eina_cpu.h \ -eina_sched.h \ -eina_tiler.h \ -eina_hamster.h \ -eina_matrixsparse.h \ -eina_inline_tiler.x \ -eina_str.h \ -eina_inline_str.x \ -eina_strbuf.h \ -eina_ustrbuf.h \ -eina_unicode.h \ -eina_quadtree.h \ -eina_simple_xml_parser.h \ -eina_lock.h \ -eina_prefix.h \ -eina_refcount.h \ -eina_mmap.h \ -eina_xattr.h \ -eina_value.h \ -eina_inline_value.x - -# Will be back for developper after 1.2. -# eina_model.h -# eina_object.h - -if EINA_HAVE_THREADS -if HAVE_WINCE -EINAHEADERS += eina_inline_lock_wince.x -else -if HAVE_WIN32 -EINAHEADERS += eina_inline_lock_win32.x -else -EINAHEADERS += eina_inline_lock_posix.x -endif -endif -else -EINAHEADERS += eina_inline_lock_void.x -endif - -installed_mainheaderdir = $(includedir)/eina-@VMAJ@ -dist_installed_mainheader_DATA = Eina.h eina_config.h - -installed_headersdir = $(includedir)/eina-@VMAJ@/eina -dist_installed_headers_DATA = $(EINAHEADERS) - -EXTRA_DIST = eina_config.h.in diff --git a/src/include/eina/Eina.h b/src/lib/eina/Eina.h similarity index 100% rename from src/include/eina/Eina.h rename to src/lib/eina/Eina.h diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am index 747eda8617..8878f2cc73 100644 --- a/src/lib/eina/Makefile.am +++ b/src/lib/eina/Makefile.am @@ -17,6 +17,96 @@ AM_CPPFLAGS += \ -I$(top_builddir)/src/lib/evil endif +EINAHEADERS = \ +eina_safety_checks.h \ +eina_error.h \ +eina_log.h \ +eina_inline_log.x \ +eina_fp.h \ +eina_inline_f32p32.x \ +eina_inline_f16p16.x \ +eina_inline_f8p24.x \ +eina_inline_fp.x \ +eina_hash.h \ +eina_inline_hash.x \ +eina_lalloc.h \ +eina_clist.h \ +eina_inline_clist.x \ +eina_inarray.h \ +eina_inlist.h \ +eina_list.h \ +eina_file.h \ +eina_mempool.h \ +eina_module.h \ +eina_rectangle.h \ +eina_types.h \ +eina_array.h \ +eina_counter.h \ +eina_inline_array.x \ +eina_magic.h \ +eina_stringshare.h \ +eina_binshare.h \ +eina_binbuf.h \ +eina_ustringshare.h \ +eina_inline_stringshare.x \ +eina_inline_ustringshare.x \ +eina_inline_list.x \ +eina_accessor.h \ +eina_convert.h \ +eina_rbtree.h \ +eina_benchmark.h \ +eina_inline_rbtree.x \ +eina_inline_mempool.x \ +eina_inline_rectangle.x \ +eina_inline_trash.x \ +eina_trash.h \ +eina_iterator.h \ +eina_main.h \ +eina_cpu.h \ +eina_sched.h \ +eina_tiler.h \ +eina_hamster.h \ +eina_matrixsparse.h \ +eina_inline_tiler.x \ +eina_str.h \ +eina_inline_str.x \ +eina_strbuf.h \ +eina_ustrbuf.h \ +eina_unicode.h \ +eina_quadtree.h \ +eina_simple_xml_parser.h \ +eina_lock.h \ +eina_prefix.h \ +eina_refcount.h \ +eina_mmap.h \ +eina_xattr.h \ +eina_value.h \ +eina_inline_value.x + +# Will be back for developper after 1.2. +# eina_model.h +# eina_object.h + +if EINA_HAVE_THREADS +if HAVE_WINCE +EINAHEADERS += eina_inline_lock_wince.x +else +if HAVE_WIN32 +EINAHEADERS += eina_inline_lock_win32.x +else +EINAHEADERS += eina_inline_lock_posix.x +endif +endif +else +EINAHEADERS += eina_inline_lock_void.x +endif + +installed_mainheaderdir = $(includedir)/eina-@VMAJ@ +dist_installed_mainheader_DATA = Eina.h eina_config.h + +installed_headersdir = $(includedir)/eina-@VMAJ@/eina +dist_installed_headers_DATA = $(EINAHEADERS) + lib_LTLIBRARIES = libeina.la libeina_la_SOURCES = \ @@ -77,6 +167,7 @@ libeina_la_SOURCES += eina_file.c endif EXTRA_DIST = \ +eina_config.h.in \ eina_strbuf_template_c.x \ eina_binbuf_template_c.x diff --git a/src/include/eina/eina_accessor.h b/src/lib/eina/eina_accessor.h similarity index 100% rename from src/include/eina/eina_accessor.h rename to src/lib/eina/eina_accessor.h diff --git a/src/include/eina/eina_array.h b/src/lib/eina/eina_array.h similarity index 100% rename from src/include/eina/eina_array.h rename to src/lib/eina/eina_array.h diff --git a/src/include/eina/eina_benchmark.h b/src/lib/eina/eina_benchmark.h similarity index 100% rename from src/include/eina/eina_benchmark.h rename to src/lib/eina/eina_benchmark.h diff --git a/src/include/eina/eina_binbuf.h b/src/lib/eina/eina_binbuf.h similarity index 100% rename from src/include/eina/eina_binbuf.h rename to src/lib/eina/eina_binbuf.h diff --git a/src/include/eina/eina_binshare.h b/src/lib/eina/eina_binshare.h similarity index 100% rename from src/include/eina/eina_binshare.h rename to src/lib/eina/eina_binshare.h diff --git a/src/include/eina/eina_clist.h b/src/lib/eina/eina_clist.h similarity index 100% rename from src/include/eina/eina_clist.h rename to src/lib/eina/eina_clist.h diff --git a/src/include/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in similarity index 100% rename from src/include/eina/eina_config.h.in rename to src/lib/eina/eina_config.h.in diff --git a/src/include/eina/eina_convert.h b/src/lib/eina/eina_convert.h similarity index 100% rename from src/include/eina/eina_convert.h rename to src/lib/eina/eina_convert.h diff --git a/src/include/eina/eina_counter.h b/src/lib/eina/eina_counter.h similarity index 100% rename from src/include/eina/eina_counter.h rename to src/lib/eina/eina_counter.h diff --git a/src/include/eina/eina_cpu.h b/src/lib/eina/eina_cpu.h similarity index 100% rename from src/include/eina/eina_cpu.h rename to src/lib/eina/eina_cpu.h diff --git a/src/include/eina/eina_error.h b/src/lib/eina/eina_error.h similarity index 100% rename from src/include/eina/eina_error.h rename to src/lib/eina/eina_error.h diff --git a/src/include/eina/eina_file.h b/src/lib/eina/eina_file.h similarity index 100% rename from src/include/eina/eina_file.h rename to src/lib/eina/eina_file.h diff --git a/src/include/eina/eina_fp.h b/src/lib/eina/eina_fp.h similarity index 100% rename from src/include/eina/eina_fp.h rename to src/lib/eina/eina_fp.h diff --git a/src/include/eina/eina_hamster.h b/src/lib/eina/eina_hamster.h similarity index 100% rename from src/include/eina/eina_hamster.h rename to src/lib/eina/eina_hamster.h diff --git a/src/include/eina/eina_hash.h b/src/lib/eina/eina_hash.h similarity index 100% rename from src/include/eina/eina_hash.h rename to src/lib/eina/eina_hash.h diff --git a/src/include/eina/eina_inarray.h b/src/lib/eina/eina_inarray.h similarity index 100% rename from src/include/eina/eina_inarray.h rename to src/lib/eina/eina_inarray.h diff --git a/src/include/eina/eina_inline_array.x b/src/lib/eina/eina_inline_array.x similarity index 100% rename from src/include/eina/eina_inline_array.x rename to src/lib/eina/eina_inline_array.x diff --git a/src/include/eina/eina_inline_clist.x b/src/lib/eina/eina_inline_clist.x similarity index 100% rename from src/include/eina/eina_inline_clist.x rename to src/lib/eina/eina_inline_clist.x diff --git a/src/include/eina/eina_inline_f16p16.x b/src/lib/eina/eina_inline_f16p16.x similarity index 100% rename from src/include/eina/eina_inline_f16p16.x rename to src/lib/eina/eina_inline_f16p16.x diff --git a/src/include/eina/eina_inline_f32p32.x b/src/lib/eina/eina_inline_f32p32.x similarity index 100% rename from src/include/eina/eina_inline_f32p32.x rename to src/lib/eina/eina_inline_f32p32.x diff --git a/src/include/eina/eina_inline_f8p24.x b/src/lib/eina/eina_inline_f8p24.x similarity index 100% rename from src/include/eina/eina_inline_f8p24.x rename to src/lib/eina/eina_inline_f8p24.x diff --git a/src/include/eina/eina_inline_fp.x b/src/lib/eina/eina_inline_fp.x similarity index 100% rename from src/include/eina/eina_inline_fp.x rename to src/lib/eina/eina_inline_fp.x diff --git a/src/include/eina/eina_inline_hash.x b/src/lib/eina/eina_inline_hash.x similarity index 100% rename from src/include/eina/eina_inline_hash.x rename to src/lib/eina/eina_inline_hash.x diff --git a/src/include/eina/eina_inline_list.x b/src/lib/eina/eina_inline_list.x similarity index 100% rename from src/include/eina/eina_inline_list.x rename to src/lib/eina/eina_inline_list.x diff --git a/src/include/eina/eina_inline_lock_posix.x b/src/lib/eina/eina_inline_lock_posix.x similarity index 100% rename from src/include/eina/eina_inline_lock_posix.x rename to src/lib/eina/eina_inline_lock_posix.x diff --git a/src/include/eina/eina_inline_lock_void.x b/src/lib/eina/eina_inline_lock_void.x similarity index 100% rename from src/include/eina/eina_inline_lock_void.x rename to src/lib/eina/eina_inline_lock_void.x diff --git a/src/include/eina/eina_inline_lock_win32.x b/src/lib/eina/eina_inline_lock_win32.x similarity index 100% rename from src/include/eina/eina_inline_lock_win32.x rename to src/lib/eina/eina_inline_lock_win32.x diff --git a/src/include/eina/eina_inline_lock_wince.x b/src/lib/eina/eina_inline_lock_wince.x similarity index 100% rename from src/include/eina/eina_inline_lock_wince.x rename to src/lib/eina/eina_inline_lock_wince.x diff --git a/src/include/eina/eina_inline_log.x b/src/lib/eina/eina_inline_log.x similarity index 100% rename from src/include/eina/eina_inline_log.x rename to src/lib/eina/eina_inline_log.x diff --git a/src/include/eina/eina_inline_mempool.x b/src/lib/eina/eina_inline_mempool.x similarity index 100% rename from src/include/eina/eina_inline_mempool.x rename to src/lib/eina/eina_inline_mempool.x diff --git a/src/include/eina/eina_inline_rbtree.x b/src/lib/eina/eina_inline_rbtree.x similarity index 100% rename from src/include/eina/eina_inline_rbtree.x rename to src/lib/eina/eina_inline_rbtree.x diff --git a/src/include/eina/eina_inline_rectangle.x b/src/lib/eina/eina_inline_rectangle.x similarity index 100% rename from src/include/eina/eina_inline_rectangle.x rename to src/lib/eina/eina_inline_rectangle.x diff --git a/src/include/eina/eina_inline_str.x b/src/lib/eina/eina_inline_str.x similarity index 100% rename from src/include/eina/eina_inline_str.x rename to src/lib/eina/eina_inline_str.x diff --git a/src/include/eina/eina_inline_stringshare.x b/src/lib/eina/eina_inline_stringshare.x similarity index 100% rename from src/include/eina/eina_inline_stringshare.x rename to src/lib/eina/eina_inline_stringshare.x diff --git a/src/include/eina/eina_inline_tiler.x b/src/lib/eina/eina_inline_tiler.x similarity index 100% rename from src/include/eina/eina_inline_tiler.x rename to src/lib/eina/eina_inline_tiler.x diff --git a/src/include/eina/eina_inline_trash.x b/src/lib/eina/eina_inline_trash.x similarity index 100% rename from src/include/eina/eina_inline_trash.x rename to src/lib/eina/eina_inline_trash.x diff --git a/src/include/eina/eina_inline_ustringshare.x b/src/lib/eina/eina_inline_ustringshare.x similarity index 100% rename from src/include/eina/eina_inline_ustringshare.x rename to src/lib/eina/eina_inline_ustringshare.x diff --git a/src/include/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x similarity index 100% rename from src/include/eina/eina_inline_value.x rename to src/lib/eina/eina_inline_value.x diff --git a/src/include/eina/eina_inlist.h b/src/lib/eina/eina_inlist.h similarity index 100% rename from src/include/eina/eina_inlist.h rename to src/lib/eina/eina_inlist.h diff --git a/src/include/eina/eina_iterator.h b/src/lib/eina/eina_iterator.h similarity index 100% rename from src/include/eina/eina_iterator.h rename to src/lib/eina/eina_iterator.h diff --git a/src/include/eina/eina_lalloc.h b/src/lib/eina/eina_lalloc.h similarity index 100% rename from src/include/eina/eina_lalloc.h rename to src/lib/eina/eina_lalloc.h diff --git a/src/include/eina/eina_list.h b/src/lib/eina/eina_list.h similarity index 100% rename from src/include/eina/eina_list.h rename to src/lib/eina/eina_list.h diff --git a/src/include/eina/eina_lock.h b/src/lib/eina/eina_lock.h similarity index 100% rename from src/include/eina/eina_lock.h rename to src/lib/eina/eina_lock.h diff --git a/src/include/eina/eina_log.h b/src/lib/eina/eina_log.h similarity index 100% rename from src/include/eina/eina_log.h rename to src/lib/eina/eina_log.h diff --git a/src/include/eina/eina_magic.h b/src/lib/eina/eina_magic.h similarity index 100% rename from src/include/eina/eina_magic.h rename to src/lib/eina/eina_magic.h diff --git a/src/include/eina/eina_main.h b/src/lib/eina/eina_main.h similarity index 100% rename from src/include/eina/eina_main.h rename to src/lib/eina/eina_main.h diff --git a/src/include/eina/eina_matrixsparse.h b/src/lib/eina/eina_matrixsparse.h similarity index 100% rename from src/include/eina/eina_matrixsparse.h rename to src/lib/eina/eina_matrixsparse.h diff --git a/src/include/eina/eina_mempool.h b/src/lib/eina/eina_mempool.h similarity index 100% rename from src/include/eina/eina_mempool.h rename to src/lib/eina/eina_mempool.h diff --git a/src/include/eina/eina_mmap.h b/src/lib/eina/eina_mmap.h similarity index 100% rename from src/include/eina/eina_mmap.h rename to src/lib/eina/eina_mmap.h diff --git a/src/include/eina/eina_model.h b/src/lib/eina/eina_model.h similarity index 100% rename from src/include/eina/eina_model.h rename to src/lib/eina/eina_model.h diff --git a/src/include/eina/eina_module.h b/src/lib/eina/eina_module.h similarity index 100% rename from src/include/eina/eina_module.h rename to src/lib/eina/eina_module.h diff --git a/src/include/eina/eina_object.h b/src/lib/eina/eina_object.h similarity index 100% rename from src/include/eina/eina_object.h rename to src/lib/eina/eina_object.h diff --git a/src/include/eina/eina_prefix.h b/src/lib/eina/eina_prefix.h similarity index 100% rename from src/include/eina/eina_prefix.h rename to src/lib/eina/eina_prefix.h diff --git a/src/include/eina/eina_quadtree.h b/src/lib/eina/eina_quadtree.h similarity index 100% rename from src/include/eina/eina_quadtree.h rename to src/lib/eina/eina_quadtree.h diff --git a/src/include/eina/eina_rbtree.h b/src/lib/eina/eina_rbtree.h similarity index 100% rename from src/include/eina/eina_rbtree.h rename to src/lib/eina/eina_rbtree.h diff --git a/src/include/eina/eina_rectangle.h b/src/lib/eina/eina_rectangle.h similarity index 100% rename from src/include/eina/eina_rectangle.h rename to src/lib/eina/eina_rectangle.h diff --git a/src/include/eina/eina_refcount.h b/src/lib/eina/eina_refcount.h similarity index 100% rename from src/include/eina/eina_refcount.h rename to src/lib/eina/eina_refcount.h diff --git a/src/include/eina/eina_safety_checks.h b/src/lib/eina/eina_safety_checks.h similarity index 100% rename from src/include/eina/eina_safety_checks.h rename to src/lib/eina/eina_safety_checks.h diff --git a/src/include/eina/eina_sched.h b/src/lib/eina/eina_sched.h similarity index 100% rename from src/include/eina/eina_sched.h rename to src/lib/eina/eina_sched.h diff --git a/src/include/eina/eina_simple_xml_parser.h b/src/lib/eina/eina_simple_xml_parser.h similarity index 100% rename from src/include/eina/eina_simple_xml_parser.h rename to src/lib/eina/eina_simple_xml_parser.h diff --git a/src/include/eina/eina_str.h b/src/lib/eina/eina_str.h similarity index 100% rename from src/include/eina/eina_str.h rename to src/lib/eina/eina_str.h diff --git a/src/include/eina/eina_strbuf.h b/src/lib/eina/eina_strbuf.h similarity index 100% rename from src/include/eina/eina_strbuf.h rename to src/lib/eina/eina_strbuf.h diff --git a/src/include/eina/eina_stringshare.h b/src/lib/eina/eina_stringshare.h similarity index 100% rename from src/include/eina/eina_stringshare.h rename to src/lib/eina/eina_stringshare.h diff --git a/src/include/eina/eina_tiler.h b/src/lib/eina/eina_tiler.h similarity index 100% rename from src/include/eina/eina_tiler.h rename to src/lib/eina/eina_tiler.h diff --git a/src/include/eina/eina_trash.h b/src/lib/eina/eina_trash.h similarity index 100% rename from src/include/eina/eina_trash.h rename to src/lib/eina/eina_trash.h diff --git a/src/include/eina/eina_types.h b/src/lib/eina/eina_types.h similarity index 100% rename from src/include/eina/eina_types.h rename to src/lib/eina/eina_types.h diff --git a/src/include/eina/eina_unicode.h b/src/lib/eina/eina_unicode.h similarity index 100% rename from src/include/eina/eina_unicode.h rename to src/lib/eina/eina_unicode.h diff --git a/src/include/eina/eina_ustrbuf.h b/src/lib/eina/eina_ustrbuf.h similarity index 100% rename from src/include/eina/eina_ustrbuf.h rename to src/lib/eina/eina_ustrbuf.h diff --git a/src/include/eina/eina_ustringshare.h b/src/lib/eina/eina_ustringshare.h similarity index 100% rename from src/include/eina/eina_ustringshare.h rename to src/lib/eina/eina_ustringshare.h diff --git a/src/include/eina/eina_value.h b/src/lib/eina/eina_value.h similarity index 100% rename from src/include/eina/eina_value.h rename to src/lib/eina/eina_value.h diff --git a/src/include/eina/eina_xattr.h b/src/lib/eina/eina_xattr.h similarity index 100% rename from src/include/eina/eina_xattr.h rename to src/lib/eina/eina_xattr.h