merge: and the eina examples

SVN revision: 76715

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

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

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

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

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