merge: and the eina examples

SVN revision: 76715

diff --git a/Makefile.am b/Makefile.am
index 11052f0..1d9a508 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ endif
 pkgconfig_DATA += eina.pc
 
 
-.PHONY: doc benchmark
+.PHONY: doc benchmark examples install-examples
 
 # Documentation
 
@@ -97,3 +97,16 @@ benchmark-e17:
        @$(MAKE) -C src benchmark-e17
        @mkdir benchmark || true
        @cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s`
+
+# examples
+
+examples:
+       @$(MAKE) -C src examples
+
+install-examples:
+       @$(MAKE) -C src install-examples
+
+# cleaning
+
+clean-local:
+       rm -rf benchmark coverage

diff --git a/configure.ac b/configure.ac
index 75bbec6..475e677 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -774,6 +774,8 @@ src/benchmarks/Makefile
 src/benchmarks/eina/Makefile
 src/bin/Makefile
 src/bin/evil/Makefile
+src/examples/Makefile
+src/examples/eina/Makefile
 src/include/Makefile
 src/include/eina/Makefile
 src/include/eina/eina_config.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 24ceadb..5298920 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib include modules bin scripts benchmarks tests
+SUBDIRS = lib include modules bin scripts benchmarks tests examples
 
-.PHONY: benchmark benchmark-e17
+.PHONY: benchmark benchmark-e17 examples
 
 benchmark:
        @make -C lib
@@ -11,3 +11,10 @@ benchmark:
 benchmark-e17:
        @make -C lib
        @$(MAKE) -C benchmarks benchmark-e17
+
+examples:
+       @make -C lib
+       @$(MAKE) -C examples examples
+
+install-examples:
+       @$(MAKE) -C examples install-examples

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
new file mode 100644 (file)
index 0000000..d6fbe3e
--- /dev/null
+++ b/src/examples/Makefile.am
@@ -0,0 +1,9 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = eina
+
+examples:
+       @$(MAKE) -C eina examples
+
+install-examples:
+       @$(MAKE) -C eina install-examples
\ No newline at end of file

diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
new file mode 100644 (file)
index 0000000..4656e47
--- /dev/null
+++ b/src/examples/eina/Makefile.am
@@ -0,0 +1,120 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina
+
+LDADD = $(top_builddir)/src/lib/eina/libeina.la
+
+SRCS = \
+eina_accessor_01.c \
+eina_array_01.c \
+eina_array_02.c \
+eina_error_01.c \
+eina_file_01.c \
+eina_hash_01.c \
+eina_hash_02.c \
+eina_hash_03.c \
+eina_hash_04.c \
+eina_hash_05.c \
+eina_hash_06.c \
+eina_hash_07.c \
+eina_hash_08.c \
+eina_iterator_01.c \
+eina_list_01.c \
+eina_list_02.c \
+eina_list_03.c \
+eina_list_04.c \
+eina_log_01.c \
+eina_log_02.c \
+eina_log_03.c \
+eina_inlist_01.c \
+eina_inlist_02.c \
+eina_inlist_03.c \
+eina_str_01.c \
+eina_strbuf_01.c \
+eina_stringshare_01.c \
+eina_tiler_01.c \
+eina_simple_xml_parser_01.c \
+eina_value_01.c \
+eina_value_02.c \
+eina_value_03.c \
+eina_inarray_01.c \
+eina_inarray_02.c
+#eina_magic_01.c \
+#eina_model_01.c \
+#eina_model_02.c \
+#eina_model_03.c
+
+EXTRA_PROGRAMS = \
+eina_accessor_01 \
+eina_array_01 \
+eina_array_02 \
+eina_error_01 \
+eina_file_01 \
+eina_hash_01 \
+eina_hash_02 \
+eina_hash_03 \
+eina_hash_04 \
+eina_hash_05 \
+eina_hash_06 \
+eina_hash_07 \
+eina_hash_08 \
+eina_iterator_01 \
+eina_list_01 \
+eina_list_02 \
+eina_list_03 \
+eina_list_04 \
+eina_log_01 \
+eina_log_02 \
+eina_log_03 \
+eina_inlist_01 \
+eina_inlist_02 \
+eina_inlist_03 \
+eina_str_01 \
+eina_strbuf_01 \
+eina_stringshare_01 \
+eina_magic_01 \
+eina_simple_xml_parser_01 \
+eina_value_01 \
+eina_value_02 \
+eina_value_03 \
+eina_inarray_01 \
+eina_inarray_02
+#eina_model_01 \
+#eina_model_02 \
+#eina_model_03 \
+#eina_model_04
+
+#eina_model_04_SOURCES = \
+#eina_model_04_animal.c \
+#eina_model_04_child.c \
+#eina_model_04_human.c \
+#eina_model_04_main.c \
+#eina_model_04_parrot.c \
+#eina_model_04_whistler.c \
+#eina_model_04_animal.h \
+#eina_model_04_child.h \
+#eina_model_04_human.h \
+#eina_model_04_parrot.h \
+#eina_model_04_whistler.h
+
+if BUILD_TILER_EXAMPLE
+AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
+EXTRA_PROGRAMS += eina_tiler_01
+eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LIBS@
+endif
+
+examples: $(EXTRA_PROGRAMS)
+
+install-examples:
+       mkdir -p $(pkgdatadir)/examples
+       $(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
+
+unsinstall-local:
+       for f in $(SRCS) ; do \
+         rm -f $(pkgdatadir)/examples/$$f ; \
+       done
+
+EXTRA_DIST = addr_book.txt chat.xml

diff --git a/legacy/eina/src/examples/addr_book.txt b/src/examples/eina/addr_book.txt
similarity index 100%
rename from legacy/eina/src/examples/addr_book.txt
rename to src/examples/eina/addr_book.txt

diff --git a/legacy/eina/src/examples/chat.xml b/src/examples/eina/chat.xml
similarity index 100%
rename from legacy/eina/src/examples/chat.xml
rename to src/examples/eina/chat.xml

diff --git a/legacy/eina/src/examples/eina_accessor_01.c b/src/examples/eina/eina_accessor_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_accessor_01.c
rename to src/examples/eina/eina_accessor_01.c

diff --git a/legacy/eina/src/examples/eina_array_01.c b/src/examples/eina/eina_array_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_array_01.c
rename to src/examples/eina/eina_array_01.c

diff --git a/legacy/eina/src/examples/eina_array_02.c b/src/examples/eina/eina_array_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_array_02.c
rename to src/examples/eina/eina_array_02.c

diff --git a/legacy/eina/src/examples/eina_error_01.c b/src/examples/eina/eina_error_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_error_01.c
rename to src/examples/eina/eina_error_01.c

diff --git a/legacy/eina/src/examples/eina_file_01.c b/src/examples/eina/eina_file_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_file_01.c
rename to src/examples/eina/eina_file_01.c

diff --git a/legacy/eina/src/examples/eina_hash_01.c b/src/examples/eina/eina_hash_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_01.c
rename to src/examples/eina/eina_hash_01.c

diff --git a/legacy/eina/src/examples/eina_hash_02.c b/src/examples/eina/eina_hash_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_02.c
rename to src/examples/eina/eina_hash_02.c

diff --git a/legacy/eina/src/examples/eina_hash_03.c b/src/examples/eina/eina_hash_03.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_03.c
rename to src/examples/eina/eina_hash_03.c

diff --git a/legacy/eina/src/examples/eina_hash_04.c b/src/examples/eina/eina_hash_04.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_04.c
rename to src/examples/eina/eina_hash_04.c

diff --git a/legacy/eina/src/examples/eina_hash_05.c b/src/examples/eina/eina_hash_05.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_05.c
rename to src/examples/eina/eina_hash_05.c

diff --git a/legacy/eina/src/examples/eina_hash_06.c b/src/examples/eina/eina_hash_06.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_06.c
rename to src/examples/eina/eina_hash_06.c

diff --git a/legacy/eina/src/examples/eina_hash_07.c b/src/examples/eina/eina_hash_07.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_07.c
rename to src/examples/eina/eina_hash_07.c

diff --git a/legacy/eina/src/examples/eina_hash_08.c b/src/examples/eina/eina_hash_08.c
similarity index 100%
rename from legacy/eina/src/examples/eina_hash_08.c
rename to src/examples/eina/eina_hash_08.c

diff --git a/legacy/eina/src/examples/eina_inarray_01.c b/src/examples/eina/eina_inarray_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_inarray_01.c
rename to src/examples/eina/eina_inarray_01.c

diff --git a/legacy/eina/src/examples/eina_inarray_02.c b/src/examples/eina/eina_inarray_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_inarray_02.c
rename to src/examples/eina/eina_inarray_02.c

diff --git a/legacy/eina/src/examples/eina_inlist_01.c b/src/examples/eina/eina_inlist_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_inlist_01.c
rename to src/examples/eina/eina_inlist_01.c

diff --git a/legacy/eina/src/examples/eina_inlist_02.c b/src/examples/eina/eina_inlist_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_inlist_02.c
rename to src/examples/eina/eina_inlist_02.c

diff --git a/legacy/eina/src/examples/eina_inlist_03.c b/src/examples/eina/eina_inlist_03.c
similarity index 100%
rename from legacy/eina/src/examples/eina_inlist_03.c
rename to src/examples/eina/eina_inlist_03.c

diff --git a/legacy/eina/src/examples/eina_iterator_01.c b/src/examples/eina/eina_iterator_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_iterator_01.c
rename to src/examples/eina/eina_iterator_01.c

diff --git a/legacy/eina/src/examples/eina_list_01.c b/src/examples/eina/eina_list_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_list_01.c
rename to src/examples/eina/eina_list_01.c

diff --git a/legacy/eina/src/examples/eina_list_02.c b/src/examples/eina/eina_list_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_list_02.c
rename to src/examples/eina/eina_list_02.c

diff --git a/legacy/eina/src/examples/eina_list_03.c b/src/examples/eina/eina_list_03.c
similarity index 100%
rename from legacy/eina/src/examples/eina_list_03.c
rename to src/examples/eina/eina_list_03.c

diff --git a/legacy/eina/src/examples/eina_list_04.c b/src/examples/eina/eina_list_04.c
similarity index 100%
rename from legacy/eina/src/examples/eina_list_04.c
rename to src/examples/eina/eina_list_04.c

diff --git a/legacy/eina/src/examples/eina_log_01.c b/src/examples/eina/eina_log_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_log_01.c
rename to src/examples/eina/eina_log_01.c

diff --git a/legacy/eina/src/examples/eina_log_02.c b/src/examples/eina/eina_log_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_log_02.c
rename to src/examples/eina/eina_log_02.c

diff --git a/legacy/eina/src/examples/eina_log_03.c b/src/examples/eina/eina_log_03.c
similarity index 100%
rename from legacy/eina/src/examples/eina_log_03.c
rename to src/examples/eina/eina_log_03.c

diff --git a/legacy/eina/src/examples/eina_magic_01.c b/src/examples/eina/eina_magic_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_magic_01.c
rename to src/examples/eina/eina_magic_01.c

diff --git a/legacy/eina/src/examples/eina_model_01.c b/src/examples/eina/eina_model_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_01.c
rename to src/examples/eina/eina_model_01.c

diff --git a/legacy/eina/src/examples/eina_model_02.c b/src/examples/eina/eina_model_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_02.c
rename to src/examples/eina/eina_model_02.c

diff --git a/legacy/eina/src/examples/eina_model_03.c b/src/examples/eina/eina_model_03.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_03.c
rename to src/examples/eina/eina_model_03.c

diff --git a/legacy/eina/src/examples/eina_model_04_animal.c b/src/examples/eina/eina_model_04_animal.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_animal.c
rename to src/examples/eina/eina_model_04_animal.c

diff --git a/legacy/eina/src/examples/eina_model_04_animal.h b/src/examples/eina/eina_model_04_animal.h
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_animal.h
rename to src/examples/eina/eina_model_04_animal.h

diff --git a/legacy/eina/src/examples/eina_model_04_child.c b/src/examples/eina/eina_model_04_child.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_child.c
rename to src/examples/eina/eina_model_04_child.c

diff --git a/legacy/eina/src/examples/eina_model_04_child.h b/src/examples/eina/eina_model_04_child.h
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_child.h
rename to src/examples/eina/eina_model_04_child.h

diff --git a/legacy/eina/src/examples/eina_model_04_human.c b/src/examples/eina/eina_model_04_human.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_human.c
rename to src/examples/eina/eina_model_04_human.c

diff --git a/legacy/eina/src/examples/eina_model_04_human.h b/src/examples/eina/eina_model_04_human.h
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_human.h
rename to src/examples/eina/eina_model_04_human.h

diff --git a/legacy/eina/src/examples/eina_model_04_main.c b/src/examples/eina/eina_model_04_main.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_main.c
rename to src/examples/eina/eina_model_04_main.c

diff --git a/legacy/eina/src/examples/eina_model_04_parrot.c b/src/examples/eina/eina_model_04_parrot.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_parrot.c
rename to src/examples/eina/eina_model_04_parrot.c

diff --git a/legacy/eina/src/examples/eina_model_04_parrot.h b/src/examples/eina/eina_model_04_parrot.h
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_parrot.h
rename to src/examples/eina/eina_model_04_parrot.h

diff --git a/legacy/eina/src/examples/eina_model_04_whistler.c b/src/examples/eina/eina_model_04_whistler.c
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_whistler.c
rename to src/examples/eina/eina_model_04_whistler.c

diff --git a/legacy/eina/src/examples/eina_model_04_whistler.h b/src/examples/eina/eina_model_04_whistler.h
similarity index 100%
rename from legacy/eina/src/examples/eina_model_04_whistler.h
rename to src/examples/eina/eina_model_04_whistler.h

diff --git a/legacy/eina/src/examples/eina_simple_xml_parser_01.c b/src/examples/eina/eina_simple_xml_parser_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_simple_xml_parser_01.c
rename to src/examples/eina/eina_simple_xml_parser_01.c

diff --git a/legacy/eina/src/examples/eina_str_01.c b/src/examples/eina/eina_str_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_str_01.c
rename to src/examples/eina/eina_str_01.c

diff --git a/legacy/eina/src/examples/eina_strbuf_01.c b/src/examples/eina/eina_strbuf_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_strbuf_01.c
rename to src/examples/eina/eina_strbuf_01.c

diff --git a/legacy/eina/src/examples/eina_stringshare_01.c b/src/examples/eina/eina_stringshare_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_stringshare_01.c
rename to src/examples/eina/eina_stringshare_01.c

diff --git a/legacy/eina/src/examples/eina_tiler_01.c b/src/examples/eina/eina_tiler_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_tiler_01.c
rename to src/examples/eina/eina_tiler_01.c

diff --git a/legacy/eina/src/examples/eina_value_01.c b/src/examples/eina/eina_value_01.c
similarity index 100%
rename from legacy/eina/src/examples/eina_value_01.c
rename to src/examples/eina/eina_value_01.c

diff --git a/legacy/eina/src/examples/eina_value_02.c b/src/examples/eina/eina_value_02.c
similarity index 100%
rename from legacy/eina/src/examples/eina_value_02.c
rename to src/examples/eina/eina_value_02.c

diff --git a/legacy/eina/src/examples/eina_value_03.c b/src/examples/eina/eina_value_03.c
similarity index 100%
rename from legacy/eina/src/examples/eina_value_03.c
rename to src/examples/eina/eina_value_03.c