diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/eina/src/examples/Makefile.am | 10 | ||||
-rw-r--r-- | libraries/eina/src/examples/Makefile.in | 68 | ||||
-rw-r--r-- | libraries/eina/src/examples/eina_array_01.c | 4 |
3 files changed, 42 insertions, 40 deletions
diff --git a/libraries/eina/src/examples/Makefile.am b/libraries/eina/src/examples/Makefile.am index ea5ca6a..45b72f0 100644 --- a/libraries/eina/src/examples/Makefile.am +++ b/libraries/eina/src/examples/Makefile.am | |||
@@ -1,6 +1,6 @@ | |||
1 | MAINTAINERCLEANFILES = Makefile.in | 1 | MAINTAINERCLEANFILES = Makefile.in |
2 | 2 | ||
3 | pkglibdir = $(datadir)/$(PACKAGE)/examples | 3 | examplesdir = $(datadir)/$(PACKAGE)/examples |
4 | 4 | ||
5 | AM_CPPFLAGS = \ | 5 | AM_CPPFLAGS = \ |
6 | -I. \ | 6 | -I. \ |
@@ -39,7 +39,7 @@ SRCS = \ | |||
39 | eina_strbuf_01.c \ | 39 | eina_strbuf_01.c \ |
40 | eina_tiler_01.c | 40 | eina_tiler_01.c |
41 | 41 | ||
42 | pkglib_PROGRAMS = | 42 | examples_PROGRAMS = |
43 | 43 | ||
44 | if EFL_INSTALL_EXAMPLES | 44 | if EFL_INSTALL_EXAMPLES |
45 | filesdir = $(datadir)/$(PACKAGE)/examples | 45 | filesdir = $(datadir)/$(PACKAGE)/examples |
@@ -47,9 +47,9 @@ files_DATA = $(SRCS) | |||
47 | endif | 47 | endif |
48 | 48 | ||
49 | if EFL_BUILD_EXAMPLES | 49 | if EFL_BUILD_EXAMPLES |
50 | pkglib_PROGRAMS += \ | 50 | examples_PROGRAMS += \ |
51 | eina_accessor_01 \ | 51 | eina_accessor_01 \ |
52 | eina_array_01 \ | 52 | eina_array_01 \ |
53 | eina_array_02 \ | 53 | eina_array_02 \ |
54 | eina_error_01 \ | 54 | eina_error_01 \ |
55 | eina_file_01 \ | 55 | eina_file_01 \ |
@@ -77,7 +77,7 @@ pkglib_PROGRAMS += \ | |||
77 | 77 | ||
78 | if BUILD_TILER_EXAMPLE | 78 | if BUILD_TILER_EXAMPLE |
79 | AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ | 79 | AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ |
80 | pkglib_PROGRAMS += eina_tiler_01 | 80 | examples_PROGRAMS += eina_tiler_01 |
81 | eina_tiler_01_LDADD = $(top_builddir)/src/lib/libeina.la @ECORE_EVAS_LIBS@ | 81 | eina_tiler_01_LDADD = $(top_builddir)/src/lib/libeina.la @ECORE_EVAS_LIBS@ |
82 | endif | 82 | endif |
83 | 83 | ||
diff --git a/libraries/eina/src/examples/Makefile.in b/libraries/eina/src/examples/Makefile.in index 3379e55..6e432bb 100644 --- a/libraries/eina/src/examples/Makefile.in +++ b/libraries/eina/src/examples/Makefile.in | |||
@@ -19,6 +19,7 @@ | |||
19 | VPATH = @srcdir@ | 19 | VPATH = @srcdir@ |
20 | pkgdatadir = $(datadir)/@PACKAGE@ | 20 | pkgdatadir = $(datadir)/@PACKAGE@ |
21 | pkgincludedir = $(includedir)/@PACKAGE@ | 21 | pkgincludedir = $(includedir)/@PACKAGE@ |
22 | pkglibdir = $(libdir)/@PACKAGE@ | ||
22 | pkglibexecdir = $(libexecdir)/@PACKAGE@ | 23 | pkglibexecdir = $(libexecdir)/@PACKAGE@ |
23 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | 24 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
24 | install_sh_DATA = $(install_sh) -c -m 644 | 25 | install_sh_DATA = $(install_sh) -c -m 644 |
@@ -34,10 +35,10 @@ PRE_UNINSTALL = : | |||
34 | POST_UNINSTALL = : | 35 | POST_UNINSTALL = : |
35 | build_triplet = @build@ | 36 | build_triplet = @build@ |
36 | host_triplet = @host@ | 37 | host_triplet = @host@ |
37 | pkglib_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) | 38 | examples_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) |
38 | @EFL_BUILD_EXAMPLES_TRUE@am__append_1 = \ | 39 | @EFL_BUILD_EXAMPLES_TRUE@am__append_1 = \ |
39 | @EFL_BUILD_EXAMPLES_TRUE@ eina_accessor_01 \ | 40 | @EFL_BUILD_EXAMPLES_TRUE@ eina_accessor_01 \ |
40 | @EFL_BUILD_EXAMPLES_TRUE@ eina_array_01 \ | 41 | @EFL_BUILD_EXAMPLES_TRUE@ eina_array_01 \ |
41 | @EFL_BUILD_EXAMPLES_TRUE@ eina_array_02 \ | 42 | @EFL_BUILD_EXAMPLES_TRUE@ eina_array_02 \ |
42 | @EFL_BUILD_EXAMPLES_TRUE@ eina_error_01 \ | 43 | @EFL_BUILD_EXAMPLES_TRUE@ eina_error_01 \ |
43 | @EFL_BUILD_EXAMPLES_TRUE@ eina_file_01 \ | 44 | @EFL_BUILD_EXAMPLES_TRUE@ eina_file_01 \ |
@@ -115,8 +116,8 @@ CONFIG_CLEAN_VPATH_FILES = | |||
115 | @EFL_BUILD_EXAMPLES_TRUE@ eina_str_01$(EXEEXT) \ | 116 | @EFL_BUILD_EXAMPLES_TRUE@ eina_str_01$(EXEEXT) \ |
116 | @EFL_BUILD_EXAMPLES_TRUE@ eina_strbuf_01$(EXEEXT) | 117 | @EFL_BUILD_EXAMPLES_TRUE@ eina_strbuf_01$(EXEEXT) |
117 | @BUILD_TILER_EXAMPLE_TRUE@@EFL_BUILD_EXAMPLES_TRUE@am__EXEEXT_2 = eina_tiler_01$(EXEEXT) | 118 | @BUILD_TILER_EXAMPLE_TRUE@@EFL_BUILD_EXAMPLES_TRUE@am__EXEEXT_2 = eina_tiler_01$(EXEEXT) |
118 | am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(filesdir)" | 119 | am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(filesdir)" |
119 | PROGRAMS = $(pkglib_PROGRAMS) | 120 | PROGRAMS = $(examples_PROGRAMS) |
120 | eina_accessor_01_SOURCES = eina_accessor_01.c | 121 | eina_accessor_01_SOURCES = eina_accessor_01.c |
121 | eina_accessor_01_OBJECTS = eina_accessor_01.$(OBJEXT) | 122 | eina_accessor_01_OBJECTS = eina_accessor_01.$(OBJEXT) |
122 | eina_accessor_01_LDADD = $(LDADD) | 123 | eina_accessor_01_LDADD = $(LDADD) |
@@ -294,7 +295,6 @@ DATA = $(files_DATA) | |||
294 | ETAGS = etags | 295 | ETAGS = etags |
295 | CTAGS = ctags | 296 | CTAGS = ctags |
296 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 297 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
297 | pkglibdir = $(datadir)/$(PACKAGE)/examples | ||
298 | ACLOCAL = @ACLOCAL@ | 298 | ACLOCAL = @ACLOCAL@ |
299 | ALLOCA = @ALLOCA@ | 299 | ALLOCA = @ALLOCA@ |
300 | AMTAR = @AMTAR@ | 300 | AMTAR = @AMTAR@ |
@@ -337,7 +337,9 @@ EFL_SIMD_FLAGS = @EFL_SIMD_FLAGS@ | |||
337 | EGREP = @EGREP@ | 337 | EGREP = @EGREP@ |
338 | EINA_CFLAGS = @EINA_CFLAGS@ | 338 | EINA_CFLAGS = @EINA_CFLAGS@ |
339 | EINA_CONFIGURE_DEFAULT_MEMPOOL = @EINA_CONFIGURE_DEFAULT_MEMPOOL@ | 339 | EINA_CONFIGURE_DEFAULT_MEMPOOL = @EINA_CONFIGURE_DEFAULT_MEMPOOL@ |
340 | EINA_CONFIGURE_ENABLE_LOG = @EINA_CONFIGURE_ENABLE_LOG@ | ||
340 | EINA_CONFIGURE_HAVE_DEBUG_THREADS = @EINA_CONFIGURE_HAVE_DEBUG_THREADS@ | 341 | EINA_CONFIGURE_HAVE_DEBUG_THREADS = @EINA_CONFIGURE_HAVE_DEBUG_THREADS@ |
342 | EINA_CONFIGURE_HAVE_DIRENT_H = @EINA_CONFIGURE_HAVE_DIRENT_H@ | ||
341 | EINA_CONFIGURE_HAVE_INTTYPES_H = @EINA_CONFIGURE_HAVE_INTTYPES_H@ | 343 | EINA_CONFIGURE_HAVE_INTTYPES_H = @EINA_CONFIGURE_HAVE_INTTYPES_H@ |
342 | EINA_CONFIGURE_HAVE_ON_OFF_THREADS = @EINA_CONFIGURE_HAVE_ON_OFF_THREADS@ | 344 | EINA_CONFIGURE_HAVE_ON_OFF_THREADS = @EINA_CONFIGURE_HAVE_ON_OFF_THREADS@ |
343 | EINA_CONFIGURE_HAVE_STDINT_H = @EINA_CONFIGURE_HAVE_STDINT_H@ | 345 | EINA_CONFIGURE_HAVE_STDINT_H = @EINA_CONFIGURE_HAVE_STDINT_H@ |
@@ -389,8 +391,6 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
389 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 391 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
390 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 392 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
391 | PKG_CONFIG = @PKG_CONFIG@ | 393 | PKG_CONFIG = @PKG_CONFIG@ |
392 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
393 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
394 | RANLIB = @RANLIB@ | 394 | RANLIB = @RANLIB@ |
395 | SED = @SED@ | 395 | SED = @SED@ |
396 | SET_MAKE = @SET_MAKE@ | 396 | SET_MAKE = @SET_MAKE@ |
@@ -465,6 +465,7 @@ top_builddir = @top_builddir@ | |||
465 | top_srcdir = @top_srcdir@ | 465 | top_srcdir = @top_srcdir@ |
466 | version_info = @version_info@ | 466 | version_info = @version_info@ |
467 | MAINTAINERCLEANFILES = Makefile.in | 467 | MAINTAINERCLEANFILES = Makefile.in |
468 | examplesdir = $(datadir)/$(PACKAGE)/examples | ||
468 | AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include \ | 469 | AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include \ |
469 | -I$(top_builddir)/src/include $(am__append_2) | 470 | -I$(top_builddir)/src/include $(am__append_2) |
470 | LDADD = \ | 471 | LDADD = \ |
@@ -536,10 +537,10 @@ $(top_srcdir)/configure: $(am__configure_deps) | |||
536 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) | 537 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
537 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 538 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
538 | $(am__aclocal_m4_deps): | 539 | $(am__aclocal_m4_deps): |
539 | install-pkglibPROGRAMS: $(pkglib_PROGRAMS) | 540 | install-examplesPROGRAMS: $(examples_PROGRAMS) |
540 | @$(NORMAL_INSTALL) | 541 | @$(NORMAL_INSTALL) |
541 | test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" | 542 | test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" |
542 | @list='$(pkglib_PROGRAMS)'; test -n "$(pkglibdir)" || list=; \ | 543 | @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \ |
543 | for p in $$list; do echo "$$p $$p"; done | \ | 544 | for p in $$list; do echo "$$p $$p"; done | \ |
544 | sed 's/$(EXEEXT)$$//' | \ | 545 | sed 's/$(EXEEXT)$$//' | \ |
545 | while read p p1; do if test -f $$p || test -f $$p1; \ | 546 | while read p p1; do if test -f $$p || test -f $$p1; \ |
@@ -556,23 +557,23 @@ install-pkglibPROGRAMS: $(pkglib_PROGRAMS) | |||
556 | while read type dir files; do \ | 557 | while read type dir files; do \ |
557 | if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ | 558 | if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
558 | test -z "$$files" || { \ | 559 | test -z "$$files" || { \ |
559 | echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibdir)$$dir'"; \ | 560 | echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(examplesdir)$$dir'"; \ |
560 | $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibdir)$$dir" || exit $$?; \ | 561 | $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(examplesdir)$$dir" || exit $$?; \ |
561 | } \ | 562 | } \ |
562 | ; done | 563 | ; done |
563 | 564 | ||
564 | uninstall-pkglibPROGRAMS: | 565 | uninstall-examplesPROGRAMS: |
565 | @$(NORMAL_UNINSTALL) | 566 | @$(NORMAL_UNINSTALL) |
566 | @list='$(pkglib_PROGRAMS)'; test -n "$(pkglibdir)" || list=; \ | 567 | @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \ |
567 | files=`for p in $$list; do echo "$$p"; done | \ | 568 | files=`for p in $$list; do echo "$$p"; done | \ |
568 | sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ | 569 | sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
569 | -e 's/$$/$(EXEEXT)/' `; \ | 570 | -e 's/$$/$(EXEEXT)/' `; \ |
570 | test -n "$$list" || exit 0; \ | 571 | test -n "$$list" || exit 0; \ |
571 | echo " ( cd '$(DESTDIR)$(pkglibdir)' && rm -f" $$files ")"; \ | 572 | echo " ( cd '$(DESTDIR)$(examplesdir)' && rm -f" $$files ")"; \ |
572 | cd "$(DESTDIR)$(pkglibdir)" && rm -f $$files | 573 | cd "$(DESTDIR)$(examplesdir)" && rm -f $$files |
573 | 574 | ||
574 | clean-pkglibPROGRAMS: | 575 | clean-examplesPROGRAMS: |
575 | @list='$(pkglib_PROGRAMS)'; test -n "$$list" || exit 0; \ | 576 | @list='$(examples_PROGRAMS)'; test -n "$$list" || exit 0; \ |
576 | echo " rm -f" $$list; \ | 577 | echo " rm -f" $$list; \ |
577 | rm -f $$list || exit $$?; \ | 578 | rm -f $$list || exit $$?; \ |
578 | test -n "$(EXEEXT)" || exit 0; \ | 579 | test -n "$(EXEEXT)" || exit 0; \ |
@@ -831,7 +832,7 @@ check-am: all-am | |||
831 | check: check-am | 832 | check: check-am |
832 | all-am: Makefile $(PROGRAMS) $(DATA) | 833 | all-am: Makefile $(PROGRAMS) $(DATA) |
833 | installdirs: | 834 | installdirs: |
834 | for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(filesdir)"; do \ | 835 | for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(filesdir)"; do \ |
835 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | 836 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
836 | done | 837 | done |
837 | install: install-am | 838 | install: install-am |
@@ -862,7 +863,7 @@ maintainer-clean-generic: | |||
862 | -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) | 863 | -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) |
863 | clean: clean-am | 864 | clean: clean-am |
864 | 865 | ||
865 | clean-am: clean-generic clean-libtool clean-pkglibPROGRAMS \ | 866 | clean-am: clean-examplesPROGRAMS clean-generic clean-libtool \ |
866 | mostlyclean-am | 867 | mostlyclean-am |
867 | 868 | ||
868 | distclean: distclean-am | 869 | distclean: distclean-am |
@@ -883,13 +884,13 @@ info: info-am | |||
883 | 884 | ||
884 | info-am: | 885 | info-am: |
885 | 886 | ||
886 | install-data-am: install-filesDATA | 887 | install-data-am: install-examplesPROGRAMS install-filesDATA |
887 | 888 | ||
888 | install-dvi: install-dvi-am | 889 | install-dvi: install-dvi-am |
889 | 890 | ||
890 | install-dvi-am: | 891 | install-dvi-am: |
891 | 892 | ||
892 | install-exec-am: install-pkglibPROGRAMS | 893 | install-exec-am: |
893 | 894 | ||
894 | install-html: install-html-am | 895 | install-html: install-html-am |
895 | 896 | ||
@@ -929,24 +930,25 @@ ps: ps-am | |||
929 | 930 | ||
930 | ps-am: | 931 | ps-am: |
931 | 932 | ||
932 | uninstall-am: uninstall-filesDATA uninstall-pkglibPROGRAMS | 933 | uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA |
933 | 934 | ||
934 | .MAKE: install-am install-strip | 935 | .MAKE: install-am install-strip |
935 | 936 | ||
936 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | 937 | .PHONY: CTAGS GTAGS all all-am check check-am clean \ |
937 | clean-libtool clean-pkglibPROGRAMS ctags distclean \ | 938 | clean-examplesPROGRAMS clean-generic clean-libtool ctags \ |
938 | distclean-compile distclean-generic distclean-libtool \ | 939 | distclean distclean-compile distclean-generic \ |
939 | distclean-tags distdir dvi dvi-am html html-am info info-am \ | 940 | distclean-libtool distclean-tags distdir dvi dvi-am html \ |
940 | install install-am install-data install-data-am install-dvi \ | 941 | html-am info info-am install install-am install-data \ |
941 | install-dvi-am install-exec install-exec-am install-filesDATA \ | 942 | install-data-am install-dvi install-dvi-am \ |
942 | install-html install-html-am install-info install-info-am \ | 943 | install-examplesPROGRAMS install-exec install-exec-am \ |
943 | install-man install-pdf install-pdf-am install-pkglibPROGRAMS \ | 944 | install-filesDATA install-html install-html-am install-info \ |
945 | install-info-am install-man install-pdf install-pdf-am \ | ||
944 | install-ps install-ps-am install-strip installcheck \ | 946 | install-ps install-ps-am install-strip installcheck \ |
945 | installcheck-am installdirs maintainer-clean \ | 947 | installcheck-am installdirs maintainer-clean \ |
946 | maintainer-clean-generic mostlyclean mostlyclean-compile \ | 948 | maintainer-clean-generic mostlyclean mostlyclean-compile \ |
947 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | 949 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
948 | tags uninstall uninstall-am uninstall-filesDATA \ | 950 | tags uninstall uninstall-am uninstall-examplesPROGRAMS \ |
949 | uninstall-pkglibPROGRAMS | 951 | uninstall-filesDATA |
950 | 952 | ||
951 | 953 | ||
952 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 954 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
diff --git a/libraries/eina/src/examples/eina_array_01.c b/libraries/eina/src/examples/eina_array_01.c index 25e0944..d93eb35 100644 --- a/libraries/eina/src/examples/eina_array_01.c +++ b/libraries/eina/src/examples/eina_array_01.c | |||
@@ -35,12 +35,12 @@ main(int argc, char **argv) | |||
35 | for (i = 0; i < 20; i++) | 35 | for (i = 0; i < 20; i++) |
36 | eina_array_push(array, strdup(strings[i])); | 36 | eina_array_push(array, strdup(strings[i])); |
37 | 37 | ||
38 | printf("array count: %d\n", eina_array_count_get(array)); | 38 | printf("array count: %d\n", eina_array_count(array)); |
39 | eina_array_foreach(array, _print, NULL); | 39 | eina_array_foreach(array, _print, NULL); |
40 | 40 | ||
41 | printf("Top gun: %s\n", (char*)eina_array_data_get(array, 2)); | 41 | printf("Top gun: %s\n", (char*)eina_array_data_get(array, 2)); |
42 | 42 | ||
43 | while (eina_array_count_get(array)) | 43 | while (eina_array_count(array)) |
44 | free(eina_array_pop(array)); | 44 | free(eina_array_pop(array)); |
45 | 45 | ||
46 | eina_array_free(array); | 46 | eina_array_free(array); |