From e379743c95a06d8aec0bb843919a35e5772423e4 Mon Sep 17 00:00:00 2001 From: Ricardo de Almeida Gonzaga Date: Fri, 8 Feb 2013 17:35:17 +0000 Subject: [PATCH] efl: add and fix some gcc lines and fix some examples. Its not possible to build from outside the directory with eina_prefix, the build still depends on PACKAGE_DATA_DIR Patch by: Ricardo de Almeida Gonzaga SVN revision: 83794 --- src/examples/ecore/ecore_animator_example.c | 2 +- src/examples/ecore/ecore_audio_custom.c | 3 ++ src/examples/ecore/ecore_audio_playback.c | 3 ++ src/examples/ecore/ecore_audio_to_ogg.c | 3 ++ src/examples/ecore/ecore_client_bench.c | 3 ++ src/examples/ecore/ecore_con_client_example.c | 3 ++ .../ecore/ecore_con_client_simple_example.c | 3 ++ src/examples/ecore/ecore_con_lookup_example.c | 3 ++ src/examples/ecore/ecore_con_server_example.c | 3 ++ .../ecore/ecore_con_server_http_example.c | 3 ++ .../ecore/ecore_con_server_simple_example.c | 3 ++ .../ecore/ecore_con_url_cookies_example.c | 3 ++ .../ecore/ecore_con_url_download_example.c | 3 ++ .../ecore/ecore_con_url_headers_example.c | 3 ++ .../ecore/ecore_evas_basics_example.c | 2 +- .../ecore/ecore_evas_buffer_example_01.c | 2 +- .../ecore/ecore_evas_buffer_example_02.c | 2 +- src/examples/ecore/ecore_evas_callbacks.c | 2 +- src/examples/ecore/ecore_evas_ews_example.c | 2 +- .../ecore/ecore_evas_object_example.c | 2 +- .../ecore/ecore_evas_window_sizes_example.c | 2 +- src/examples/ecore/ecore_event_example_01.c | 6 +-- src/examples/ecore/ecore_event_example_02.c | 3 ++ .../ecore/ecore_fd_handler_gnutls_example.c | 3 ++ .../ecore/ecore_file_download_example.c | 3 ++ src/examples/ecore/ecore_idler_example.c | 3 ++ src/examples/ecore/ecore_imf_example.c | 2 +- src/examples/ecore/ecore_job_example.c | 3 ++ .../ecore/ecore_pipe_gstreamer_example.c | 3 ++ src/examples/ecore/ecore_poller_example.c | 3 ++ src/examples/ecore/ecore_server_bench.c | 3 ++ src/examples/ecore/ecore_thread_example.c | 2 +- .../ecore/ecore_time_functions_example.c | 3 ++ src/examples/ecore/ecore_timer_example.c | 3 ++ src/examples/edbus/banshee.c | 3 ++ src/examples/edbus/client.c | 3 ++ .../edbus/complex-types-client-eina-value.c | 3 ++ src/examples/edbus/complex-types-server.c | 3 ++ src/examples/edbus/complex-types.c | 3 ++ src/examples/edbus/connman-list-services.c | 3 ++ src/examples/edbus/ofono-dial.c | 3 ++ src/examples/edbus/server.c | 3 ++ src/examples/edbus/simple-signal-emit.c | 3 ++ src/examples/edje/animations2.c | 33 +++++------- src/examples/edje/edje-animations.c | 31 +++-------- src/examples/edje/edje-basic.c | 45 +++++----------- src/examples/edje/edje-basic2.c | 41 ++++---------- src/examples/edje/edje-box.c | 31 +++-------- src/examples/edje/edje-box2.c | 31 +++-------- src/examples/edje/edje-codegen-example.c | 40 ++++---------- src/examples/edje/edje-color-class.c | 27 +++------- src/examples/edje/edje-drag.c | 31 +++-------- src/examples/edje/edje-multisense.c | 9 +++- src/examples/edje/edje-perspective.c | 35 ++++-------- src/examples/edje/edje-signals-messages.c | 42 +++++---------- src/examples/edje/edje-swallow.c | 31 +++-------- src/examples/edje/edje-swallow2.c | 43 +++++---------- src/examples/edje/edje-table.c | 31 +++-------- src/examples/edje/edje-text.c | 31 +++-------- src/examples/edje/edje_example.c | 10 +++- src/examples/edje/signals2.c | 31 +++++------ src/examples/edje/sigtest.c | 53 +++++++------------ src/examples/eet/eet-basic.c | 3 ++ src/examples/eet/eet-data-cipher_decipher.c | 5 +- .../eet/eet-data-file_descriptor_01.c | 6 +-- .../eet/eet-data-file_descriptor_02.c | 5 +- src/examples/eet/eet-data-nested.c | 6 +-- src/examples/eet/eet-data-simple.c | 6 +-- src/examples/eet/eet-file.c | 6 +-- src/examples/eina/eina_simple_xml_parser_01.c | 2 +- src/examples/eina/eina_xattr_01.c | 2 +- src/examples/eio/eio_file_copy.c | 5 +- src/examples/eio/eio_file_ls.c | 5 +- src/examples/emotion/emotion_basic_example.c | 3 ++ src/examples/emotion/emotion_border_example.c | 3 ++ .../emotion/emotion_generic_example.c | 3 ++ .../emotion_generic_subtitle_example.c | 3 ++ .../emotion/emotion_signals_example.c | 3 ++ src/examples/ethumb_client/ethumb_dbus.c | 2 + src/examples/evas/evas-aspect-hints.c | 3 +- src/examples/evas/evas-hints.c | 2 +- src/examples/evas/evas-images3.c | 2 +- src/examples/evas/evas-init-shutdown.c | 3 +- src/examples/evas/evas-map-utils.c | 10 +++- .../evas/evas-object-manipulation-eo.c | 2 +- src/examples/evas/evas-stacking.c | 2 +- src/examples/evas/evas-table.c | 2 +- 87 files changed, 358 insertions(+), 484 deletions(-) diff --git a/src/examples/ecore/ecore_animator_example.c b/src/examples/ecore/ecore_animator_example.c index 545d48a1e4..c35261d79d 100644 --- a/src/examples/ecore/ecore_animator_example.c +++ b/src/examples/ecore/ecore_animator_example.c @@ -1,5 +1,5 @@ //Compile with: -//gcc -g -Wall `pkg-config --cflags --libs ecore-evas` -o ecore_animator_example ecore_animator_example.c +//gcc -g -Wall `pkg-config --cflags --libs evas ecore-evas` -o ecore_animator_example ecore_animator_example.c #include #include diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c index d94a4b4095..b63d2a585c 100644 --- a/src/examples/ecore/ecore_audio_custom.c +++ b/src/examples/ecore/ecore_audio_custom.c @@ -1,3 +1,6 @@ +// Compile with: +// gcc -o ecore_audio_custom ecore_audio_custom.c `pkg-config --libs --cflags ecore ecore-audio` + #include #include #include diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c index 1ec7444804..6b0f0f4783 100644 --- a/src/examples/ecore/ecore_audio_playback.c +++ b/src/examples/ecore/ecore_audio_playback.c @@ -1,3 +1,6 @@ +// Compile with: +// gcc -o ecore_audio_playback ecore_audio_playback.c `pkg-config --libs --cflags ecore eina ecore-audio` + #include #include #include diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c index 120f9f91f4..8cbf288045 100644 --- a/src/examples/ecore/ecore_audio_to_ogg.c +++ b/src/examples/ecore/ecore_audio_to_ogg.c @@ -1,3 +1,6 @@ +// Compile with: +// gcc -o ecore_audio_to_ogg ecore_audio_to_ogg.c `pkg-config --libs --cflags ecore eina ecore-audio` + #include #include #include diff --git a/src/examples/ecore/ecore_client_bench.c b/src/examples/ecore/ecore_client_bench.c index dc550eea74..f4ef3ed615 100644 --- a/src/examples/ecore/ecore_client_bench.c +++ b/src/examples/ecore/ecore_client_bench.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_client_bench ecore_client_bench.c `pkg-config --libs --cflags ecore ecore-con eina` + #include #include #include diff --git a/src/examples/ecore/ecore_con_client_example.c b/src/examples/ecore/ecore_con_client_example.c index ae4bd84353..580289fc29 100644 --- a/src/examples/ecore/ecore_con_client_example.c +++ b/src/examples/ecore/ecore_con_client_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_client_example ecore_con_client_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/examples/ecore/ecore_con_client_simple_example.c b/src/examples/ecore/ecore_con_client_simple_example.c index 48b1933ca7..d315bd6fb1 100644 --- a/src/examples/ecore/ecore_con_client_simple_example.c +++ b/src/examples/ecore/ecore_con_client_simple_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_client_simple_example ecore_con_client_simple_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #include #include #include diff --git a/src/examples/ecore/ecore_con_lookup_example.c b/src/examples/ecore/ecore_con_lookup_example.c index 1a47d0ba32..d81abf3a7d 100644 --- a/src/examples/ecore/ecore_con_lookup_example.c +++ b/src/examples/ecore/ecore_con_lookup_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_lookup_example ecore_con_lookup_example.c `pkg-config --libs --cflags ecore ecore-con` + #include #include #include diff --git a/src/examples/ecore/ecore_con_server_example.c b/src/examples/ecore/ecore_con_server_example.c index 9b929e46e4..da63d28a5e 100644 --- a/src/examples/ecore/ecore_con_server_example.c +++ b/src/examples/ecore/ecore_con_server_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_server_example ecore_con_server_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/examples/ecore/ecore_con_server_http_example.c b/src/examples/ecore/ecore_con_server_http_example.c index 14d1ecb5b0..c6e9c23bfb 100644 --- a/src/examples/ecore/ecore_con_server_http_example.c +++ b/src/examples/ecore/ecore_con_server_http_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_server_http_example ecore_con_server_http_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #include #include #include diff --git a/src/examples/ecore/ecore_con_server_simple_example.c b/src/examples/ecore/ecore_con_server_simple_example.c index c771b2af3e..8cae748675 100644 --- a/src/examples/ecore/ecore_con_server_simple_example.c +++ b/src/examples/ecore/ecore_con_server_simple_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_server_simple_example ecore_con_server_simple_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #include #include #include diff --git a/src/examples/ecore/ecore_con_url_cookies_example.c b/src/examples/ecore/ecore_con_url_cookies_example.c index 908df0f2a0..dce99895c8 100644 --- a/src/examples/ecore/ecore_con_url_cookies_example.c +++ b/src/examples/ecore/ecore_con_url_cookies_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_url_cookies_example ecore_con_url_cookies_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #include #include #include diff --git a/src/examples/ecore/ecore_con_url_download_example.c b/src/examples/ecore/ecore_con_url_download_example.c index 6eed89afdc..2723cc8d5e 100644 --- a/src/examples/ecore/ecore_con_url_download_example.c +++ b/src/examples/ecore/ecore_con_url_download_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_url_download_example ecore_con_url_download_example.c `pkg-config --libs --cflags ecore ecore-con` + #include #include #include diff --git a/src/examples/ecore/ecore_con_url_headers_example.c b/src/examples/ecore/ecore_con_url_headers_example.c index fb05df35ea..0911c68ace 100644 --- a/src/examples/ecore/ecore_con_url_headers_example.c +++ b/src/examples/ecore/ecore_con_url_headers_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_con_url_headers_example ecore_con_url_headers_example.c `pkg-config --libs --cflags ecore ecore-con eina` + #include #include #include diff --git a/src/examples/ecore/ecore_evas_basics_example.c b/src/examples/ecore/ecore_evas_basics_example.c index b62c64ad72..b6fb94a2d3 100644 --- a/src/examples/ecore/ecore_evas_basics_example.c +++ b/src/examples/ecore/ecore_evas_basics_example.c @@ -5,7 +5,7 @@ * buffer one). See stdout/stderr for output. * * @verbatim - * gcc -o ecore_evas_basics_example ecore_evas_basics_example.c `pkg-config --libs --cflags ecore-evas` + * gcc -o ecore_evas_basics_example ecore_evas_basics_example.c `pkg-config --libs --cflags ecore evas ecore-evas` * @endverbatim */ diff --git a/src/examples/ecore/ecore_evas_buffer_example_01.c b/src/examples/ecore/ecore_evas_buffer_example_01.c index 39f6dd11d7..71ed986818 100644 --- a/src/examples/ecore/ecore_evas_buffer_example_01.c +++ b/src/examples/ecore/ecore_evas_buffer_example_01.c @@ -7,7 +7,7 @@ * Compile with: * * @verbatim - * gcc -o evas-buffer-simple evas-buffer-simple.c `pkg-config --libs --cflags evas evas-software-buffer` + * gcc -o ecore_evas_buffer_example_01 ecore_evas_buffer_example_01.c `pkg-config --libs --cflags evas ecore-evas evas-software-buffer` * @endverbatim * */ diff --git a/src/examples/ecore/ecore_evas_buffer_example_02.c b/src/examples/ecore/ecore_evas_buffer_example_02.c index d30d764867..0d59e1fa62 100644 --- a/src/examples/ecore/ecore_evas_buffer_example_02.c +++ b/src/examples/ecore/ecore_evas_buffer_example_02.c @@ -7,7 +7,7 @@ * Compile with: * * @verbatim - * gcc -o evas-buffer-simple evas-buffer-simple.c `pkg-config --libs --cflags evas evas-software-buffer` + * gcc -o ecore_evas_buffer_example_02 ecore_evas_buffer_example_02.c `pkg-config --libs --cflags ecore evas ecore-evas evas-software-buffer` * @endverbatim * */ diff --git a/src/examples/ecore/ecore_evas_callbacks.c b/src/examples/ecore/ecore_evas_callbacks.c index 3e42da161a..5c1a5d6a15 100644 --- a/src/examples/ecore/ecore_evas_callbacks.c +++ b/src/examples/ecore/ecore_evas_callbacks.c @@ -5,7 +5,7 @@ * buffer one). See stdout/stderr for output. * * @verbatim - * gcc -o ecore_evas_callbacks ecore_evas_callbacks.c `pkg-config --libs --cflags ecore-evas` + * gcc -o ecore_evas_callbacks ecore_evas_callbacks.c `pkg-config --libs --cflags ecore ecore-evas` * @endverbatim */ diff --git a/src/examples/ecore/ecore_evas_ews_example.c b/src/examples/ecore/ecore_evas_ews_example.c index 1209ffd032..07c0a238b1 100644 --- a/src/examples/ecore/ecore_evas_ews_example.c +++ b/src/examples/ecore/ecore_evas_ews_example.c @@ -5,7 +5,7 @@ * buffer one). See stdout/stderr for output. * * @verbatim - * gcc -o ecore_evas_ews_example ecore_evas_ews_example.c `pkg-config --libs --cflags ecore-evas` + * gcc -o ecore_evas_ews_example ecore_evas_ews_example.c `pkg-config --libs --cflags ecore evas ecore-evas` * @endverbatim */ diff --git a/src/examples/ecore/ecore_evas_object_example.c b/src/examples/ecore/ecore_evas_object_example.c index 38e4c4b277..c76f186bb5 100644 --- a/src/examples/ecore/ecore_evas_object_example.c +++ b/src/examples/ecore/ecore_evas_object_example.c @@ -5,7 +5,7 @@ * buffer one). See stdout/stderr for output. * * @verbatim - * gcc -o ecore_evas_object_example ecore_evas_object_example.c `pkg-config --libs --cflags ecore-evas` + * gcc -o ecore_evas_object_example ecore_evas_object_example.c `pkg-config --libs --cflags ecore evas ecore-evas` * @endverbatim */ diff --git a/src/examples/ecore/ecore_evas_window_sizes_example.c b/src/examples/ecore/ecore_evas_window_sizes_example.c index 833529effc..5edd52a840 100644 --- a/src/examples/ecore/ecore_evas_window_sizes_example.c +++ b/src/examples/ecore/ecore_evas_window_sizes_example.c @@ -6,7 +6,7 @@ * one). See stdout/stderr for output. * * @verbatim - * gcc -o evas-smart-object evas-smart-object.c `pkg-config --libs --cflags evas ecore ecore-evas` + * gcc -o ecore_evas_window_sizes_example ecore_evas_window_sizes_example.c `pkg-config --libs --cflags evas ecore ecore-evas` * @endverbatim */ diff --git a/src/examples/ecore/ecore_event_example_01.c b/src/examples/ecore/ecore_event_example_01.c index 64a5be8650..708afbaffe 100644 --- a/src/examples/ecore/ecore_event_example_01.c +++ b/src/examples/ecore/ecore_event_example_01.c @@ -1,7 +1,5 @@ -/* - * Compile with: - * gcc -g -Wall `pkg-config --cflags --libs ecore` -o ecore_event_example ecore_event_example.c - */ +//Compile with: +// gcc -g -Wall `pkg-config --cflags --libs ecore` -o ecore_event_example_01 ecore_event_example_01.c #include diff --git a/src/examples/ecore/ecore_event_example_02.c b/src/examples/ecore/ecore_event_example_02.c index c293e65453..c8161bac9b 100644 --- a/src/examples/ecore/ecore_event_example_02.c +++ b/src/examples/ecore/ecore_event_example_02.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -g -Wall `pkg-config --cflags --libs ecore` -o ecore_event_example_02 ecore_event_example_02.c + #include #include diff --git a/src/examples/ecore/ecore_fd_handler_gnutls_example.c b/src/examples/ecore/ecore_fd_handler_gnutls_example.c index 5635b131cc..078b5d7301 100644 --- a/src/examples/ecore/ecore_fd_handler_gnutls_example.c +++ b/src/examples/ecore/ecore_fd_handler_gnutls_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_fd_handler_gnutls_example ecore_fd_handler_gnutls_example.c `pkg-config --cflags --libs ecore gnutls` + #include #include #include diff --git a/src/examples/ecore/ecore_file_download_example.c b/src/examples/ecore/ecore_file_download_example.c index 42cff6c32d..e44c7e7312 100644 --- a/src/examples/ecore/ecore_file_download_example.c +++ b/src/examples/ecore/ecore_file_download_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_file_download_example ecore_file_download_example.c `pkg-config --libs --cflags ecore eina ecore-file` + #include #include #include diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c index 9db99cd6d4..de69a44129 100644 --- a/src/examples/ecore/ecore_idler_example.c +++ b/src/examples/ecore/ecore_idler_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_idler_example ecore_idler_example.c `pkg-config --libs --cflags ecore eo` + #include #include diff --git a/src/examples/ecore/ecore_imf_example.c b/src/examples/ecore/ecore_imf_example.c index 9aa3334fe2..bc03db9ca2 100644 --- a/src/examples/ecore/ecore_imf_example.c +++ b/src/examples/ecore/ecore_imf_example.c @@ -2,7 +2,7 @@ * Ecore example illustrating how to use ecore imf. * * @verbatim - * gcc -o ecore_imf_example ecore_imf_example.c `pkg-config --cflags --libs ecore evas ecore-evas ecore-imf ecore-imf-evas` + * gcc -o ecore_imf_example ecore_imf_example.c `pkg-config --cflags --libs ecore evas eina ecore-evas ecore-imf ecore-imf-evas` * @endverbatim */ diff --git a/src/examples/ecore/ecore_job_example.c b/src/examples/ecore/ecore_job_example.c index 561a851410..2621d7f1f5 100644 --- a/src/examples/ecore/ecore_job_example.c +++ b/src/examples/ecore/ecore_job_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_job_example ecore_job_example.c `pkg-config --libs --cflags ecore` + #include #include diff --git a/src/examples/ecore/ecore_pipe_gstreamer_example.c b/src/examples/ecore/ecore_pipe_gstreamer_example.c index 7eb537045a..008b96e5d8 100644 --- a/src/examples/ecore/ecore_pipe_gstreamer_example.c +++ b/src/examples/ecore/ecore_pipe_gstreamer_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_pipe_gstreamer_example ecore_pipe_gstreamer_example.c `pkg-config --libs --cflags ecore gstreamer-0.10` + #include #include diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c index ccd1c2e355..ef8592bc03 100644 --- a/src/examples/ecore/ecore_poller_example.c +++ b/src/examples/ecore/ecore_poller_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_poller_example ecore_poller_example.c `pkg-config --libs --cflags ecore eo` + #include #include diff --git a/src/examples/ecore/ecore_server_bench.c b/src/examples/ecore/ecore_server_bench.c index 1f9b63a890..8c5961ef88 100644 --- a/src/examples/ecore/ecore_server_bench.c +++ b/src/examples/ecore/ecore_server_bench.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_server_bench ecore_server_bench.c `pkg-config --libs --cflags ecore eina ecore-con` + #include #include #include diff --git a/src/examples/ecore/ecore_thread_example.c b/src/examples/ecore/ecore_thread_example.c index a34491911b..74cbffbb67 100644 --- a/src/examples/ecore/ecore_thread_example.c +++ b/src/examples/ecore/ecore_thread_example.c @@ -1,5 +1,5 @@ /* - * gcc -o ecore_thread_example ecore_thread_example.c `pkg-config --cflags --libs ecore` + * gcc -o ecore_thread_example ecore_thread_example.c `pkg-config --cflags --libs ecore eina` */ #include #include diff --git a/src/examples/ecore/ecore_time_functions_example.c b/src/examples/ecore/ecore_time_functions_example.c index d742c8be3c..3e7b703d38 100644 --- a/src/examples/ecore/ecore_time_functions_example.c +++ b/src/examples/ecore/ecore_time_functions_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_time_functions_example ecore_time_functions_example.c `pkg-config --libs --cflags ecore` + #include #include diff --git a/src/examples/ecore/ecore_timer_example.c b/src/examples/ecore/ecore_timer_example.c index bafeacb69c..27d2958413 100644 --- a/src/examples/ecore/ecore_timer_example.c +++ b/src/examples/ecore/ecore_timer_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ecore_timer_example ecore_timer_example.c `pkg-config --libs --cflags ecore` + #include #include diff --git a/src/examples/edbus/banshee.c b/src/examples/edbus/banshee.c index 8223139e8e..62194b3253 100644 --- a/src/examples/edbus/banshee.c +++ b/src/examples/edbus/banshee.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o banshee banshee.c `pkg-config --cflags --libs edbus2 ecore eina` + #include "EDBus.h" #include diff --git a/src/examples/edbus/client.c b/src/examples/edbus/client.c index 8a0420c490..61b3e24ec7 100644 --- a/src/examples/edbus/client.c +++ b/src/examples/edbus/client.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o client client.c `pkg-config --cflags --libs edbus2 ecore eina` + #include "EDBus.h" #include diff --git a/src/examples/edbus/complex-types-client-eina-value.c b/src/examples/edbus/complex-types-client-eina-value.c index cde7c9b2ce..91b3ecca46 100644 --- a/src/examples/edbus/complex-types-client-eina-value.c +++ b/src/examples/edbus/complex-types-client-eina-value.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o complex-types-client-eina-value complex-types-client-eina-value.c `pkg-config --cflags --libs edbus2 ecore eina` + #include "EDBus.h" #include diff --git a/src/examples/edbus/complex-types-server.c b/src/examples/edbus/complex-types-server.c index 7441690c71..2409ce73b0 100644 --- a/src/examples/edbus/complex-types-server.c +++ b/src/examples/edbus/complex-types-server.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o complex-types-server complex-types-server.c `pkg-config --cflags --libs edbus2 ecore` + #include "EDBus.h" #include diff --git a/src/examples/edbus/complex-types.c b/src/examples/edbus/complex-types.c index e60badfaff..3fa4e0be68 100644 --- a/src/examples/edbus/complex-types.c +++ b/src/examples/edbus/complex-types.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o complex-types complex-types.c `pkg-config --cflags --libs edbus2 ecore` + #include "EDBus.h" #include diff --git a/src/examples/edbus/connman-list-services.c b/src/examples/edbus/connman-list-services.c index 73b3970dcc..7bd81c2e5f 100644 --- a/src/examples/edbus/connman-list-services.c +++ b/src/examples/edbus/connman-list-services.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o connman-list-services connman-list-services.c `pkg-config --cflags --libs edbus2 ecore` + #include "EDBus.h" #include diff --git a/src/examples/edbus/ofono-dial.c b/src/examples/edbus/ofono-dial.c index b2da85547e..84729db673 100644 --- a/src/examples/edbus/ofono-dial.c +++ b/src/examples/edbus/ofono-dial.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o ofono-dial ofono-dial.c `pkg-config --cflags --libs edbus2 ecore` + #include "EDBus.h" #include diff --git a/src/examples/edbus/server.c b/src/examples/edbus/server.c index dd606bd6b1..d10a672fe6 100644 --- a/src/examples/edbus/server.c +++ b/src/examples/edbus/server.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o server server.c `pkg-config --cflags --libs edbus2 ecore` + #include "EDBus.h" #include diff --git a/src/examples/edbus/simple-signal-emit.c b/src/examples/edbus/simple-signal-emit.c index 960bfe632e..14e1fee705 100644 --- a/src/examples/edbus/simple-signal-emit.c +++ b/src/examples/edbus/simple-signal-emit.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o simple-signal-emit simple-signal-emit.c `pkg-config --cflags --libs edbus2` + #include enum { diff --git a/src/examples/edje/animations2.c b/src/examples/edje/animations2.c index 045c5cc0e5..e33f0e72c9 100644 --- a/src/examples/edje/animations2.c +++ b/src/examples/edje/animations2.c @@ -1,3 +1,6 @@ +//Compile with: +// edje_cc animations2.edc && gcc -o animations2 animations2.c `pkg-config --libs --cflags ecore ecore-evas edje` + #ifdef HAVE_CONFIG_H #include "config.h" #else @@ -5,6 +8,10 @@ #define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -14,19 +21,17 @@ #define HEIGHT (700) static void -_on_delete(Ecore_Evas *ee) +_on_delete(Ecore_Evas *ee EINA_UNUSED) { ecore_main_loop_quit(); } int -main(int argc EINA_UNUSED, char **argv) +main(int argc EINA_UNUSED, char **argv EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "animations2.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/animations2.edj"; Evas *evas; Ecore_Evas *ee; - Eina_Prefix *pfx; Evas_Object *edje_obj; Evas_Object *bg; @@ -34,15 +39,9 @@ main(int argc EINA_UNUSED, char **argv) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, "EDJE_EXAMPLES", "edje/examples", - edje_file, PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); - - if (!pfx) goto shutdown_edje; - ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) goto eina_prefix_free; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Animations"); @@ -60,15 +59,14 @@ main(int argc EINA_UNUSED, char **argv) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), "%s/examples/%s", - eina_prefix_data_get(pfx), edje_file); + fprintf(stderr, "loading edje file; %s\n", edje_file); - if (!edje_object_file_set(edje_obj, edje_file_path, "animation_group")) + if (!edje_object_file_set(edje_obj, edje_file, "animation_group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); fprintf(stderr, "Could not load the edje file - reason:%s\n", errmsg); - goto eina_prefix_free; + goto shutdown_edje; } evas_object_resize(edje_obj, 700, 700); @@ -79,15 +77,12 @@ main(int argc EINA_UNUSED, char **argv) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); edje_shutdown(); ecore_evas_shutdown(); return EXIT_SUCCESS; - eina_prefix_free: eina_prefix_free(pfx); - shutdown_edje: edje_shutdown(); shutdown_ecore_evas: ecore_evas_shutdown(); diff --git a/src/examples/edje/edje-animations.c b/src/examples/edje/edje-animations.c index c873781ec6..413394c5ca 100644 --- a/src/examples/edje/edje-animations.c +++ b/src/examples/edje/edje-animations.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -143,15 +147,13 @@ _on_key_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, v } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "animations.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/animations.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -159,22 +161,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete_cb); ecore_evas_callback_resize_set(ee, _on_canvas_resize); @@ -191,9 +181,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "animations_group"); + edje_object_file_set(edje_obj, edje_file, "animations_group"); evas_object_move(edje_obj, 0, 0); evas_object_resize(edje_obj, WIDTH, HEIGHT); evas_object_show(edje_obj); @@ -209,15 +197,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-basic.c b/src/examples/edje/edje-basic.c index 4d4bc27531..4c7fad6357 100644 --- a/src/examples/edje/edje-basic.c +++ b/src/examples/edje/edje-basic.c @@ -6,7 +6,7 @@ * buffer one). See stdout/stderr for output. * * @verbatim - * gcc -o edje-basic edje-basic.c `pkg-config --libs --cflags evas ecore ecore-evas edje` + * edje_cc basic.edc && gcc -o edje-basic edje-basic.c `pkg-config --libs --cflags evas ecore ecore-evas edje` * @endverbatim */ @@ -16,6 +16,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include @@ -98,17 +102,15 @@ _on_delete(Ecore_Evas *ee EINA_UNUSED) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char border_img_path[PATH_MAX]; - char edje_file_path[PATH_MAX]; - const char *edje_file = "basic.edj"; + const char *img_file = PACKAGE_DATA_DIR"/red.png"; + const char *edje_file = PACKAGE_DATA_DIR"/basic.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *border; Evas_Object *edje_obj; - Eina_Prefix *pfx; int x; int y; int w; @@ -120,22 +122,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Edje Basics Example"); @@ -153,11 +143,8 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - printf("%s\n", edje_file_path); /* exercising Edje loading error, on purpose */ - if (!edje_object_file_set(edje_obj, edje_file_path, "unexistant_group")) + if (!edje_object_file_set(edje_obj, edje_file, "unexistant_group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); @@ -165,7 +152,7 @@ main(int argc EINA_UNUSED, char *argv[]) " %s\n", errmsg); } - if (!edje_object_file_set(edje_obj, edje_file_path, "example_group")) + if (!edje_object_file_set(edje_obj, edje_file, "example_group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); @@ -173,7 +160,7 @@ main(int argc EINA_UNUSED, char *argv[]) errmsg); evas_object_del(edje_obj); - goto free_prefix; + goto shutdown_edje; } fprintf(stdout, "Loaded Edje object bound to group 'example_group' from" @@ -185,13 +172,10 @@ main(int argc EINA_UNUSED, char *argv[]) evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, edje_obj); - snprintf(border_img_path, sizeof(border_img_path), - "%s/edje/examples/red.png", eina_prefix_data_get(pfx)); - /* this is a border around the Edje object above, here just to * emphasize its geometry */ border = evas_object_image_filled_add(evas); - evas_object_image_file_set(border, border_img_path, NULL); + evas_object_image_file_set(border, img_file, NULL); evas_object_image_border_set(border, 2, 2, 2, 2); evas_object_image_border_center_fill_set(border, EVAS_BORDER_FILL_NONE); @@ -239,15 +223,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-basic2.c b/src/examples/edje/edje-basic2.c index e68d1ec6d2..8836e7e700 100644 --- a/src/examples/edje/edje-basic2.c +++ b/src/examples/edje/edje-basic2.c @@ -1,6 +1,6 @@ /** * @verbatim -* gcc -o edje-basic2 edje-basic2.c `pkg-config --libs --cflags evas ecore ecore-evas edje` +* edje_cc basic2.edc && gcc -o edje-basic2 edje-basic2.c `pkg-config --libs --cflags evas ecore ecore-evas edje` * @endverbatim */ @@ -10,6 +10,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include @@ -76,11 +80,9 @@ _on_delete(Ecore_Evas *ee EINA_UNUSED) } int -main(int argc EINA_UNUSED, char **argv) +main(int argc EINA_UNUSED, char **argv EINA_UNUSED) { - const char *edje_file = "basic2.edj"; - char edje_file_path[PATH_MAX]; - Eina_Prefix *pfx; + const char *edje_file = PACKAGE_DATA_DIR"/basic2.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; @@ -92,22 +94,9 @@ main(int argc EINA_UNUSED, char **argv) if(!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - - if(!pfx) - goto shutdown_edje; - ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if(!ee) - goto eina_prefix_free; + if(!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Edje show image"); @@ -123,22 +112,16 @@ main(int argc EINA_UNUSED, char **argv) ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE); evas_object_focus_set(bg, EINA_TRUE); - edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - - if(!edje_object_file_set(edje_obj, edje_file_path, "image_group")) + if(!edje_object_file_set(edje_obj, edje_file, "image_group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); fprintf(stderr, "Could not load the edje file - reason:%s\n", errmsg); - goto eina_prefix_free; + goto shutdown_edje; } - - evas_object_move(edje_obj, 50, 50); evas_object_resize(edje_obj, 64, 64); evas_object_show(edje_obj); @@ -151,16 +134,12 @@ main(int argc EINA_UNUSED, char **argv) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); edje_shutdown(); ecore_evas_shutdown(); return EXIT_SUCCESS; -eina_prefix_free: - eina_prefix_free(pfx); - shutdown_edje: edje_shutdown(); diff --git a/src/examples/edje/edje-box.c b/src/examples/edje/edje-box.c index 3da66e2bec..20cf56e094 100644 --- a/src/examples/edje/edje-box.c +++ b/src/examples/edje/edje-box.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -152,15 +156,13 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "box.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/box.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; - Eina_Prefix *pfx; int i; if (!ecore_evas_init()) @@ -169,22 +171,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_destroy_set(ee, _on_destroy); ecore_evas_callback_resize_set(ee, _on_canvas_resize); @@ -203,9 +193,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "example/group"); + edje_object_file_set(edje_obj, edje_file, "example/group"); evas_object_move(edje_obj, 0, 0); evas_object_resize(edje_obj, WIDTH, HEIGHT); evas_object_show(edje_obj); @@ -234,15 +222,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-box2.c b/src/examples/edje/edje-box2.c index 436b62177d..e2a172f267 100644 --- a/src/examples/edje/edje-box2.c +++ b/src/examples/edje/edje-box2.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -151,17 +155,15 @@ on_destroy(Ecore_Evas *ee EINA_UNUSED) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "box.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/box.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; Evas_Object *last; Evas_Object *o; - Eina_Prefix *pfx; int w; int h; int i; @@ -172,22 +174,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, 640, 480, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_resize_set(ee, on_resize); ecore_evas_callback_destroy_set(ee, on_destroy); @@ -203,9 +193,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_box_layout_register("custom_layout", custom_layout, NULL, NULL, NULL, NULL); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_obj = box_new(ee, edje_file_path, "box", 0, 0, w, h); + edje_obj = box_new(ee, edje_file, "box", 0, 0, w, h); evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, on_keydown, edje_obj); for (i = 1; i <= 5; i++) @@ -229,15 +217,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-codegen-example.c b/src/examples/edje/edje-codegen-example.c index 6eff2339db..910fd5451b 100644 --- a/src/examples/edje/edje-codegen-example.c +++ b/src/examples/edje/edje-codegen-example.c @@ -29,6 +29,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include "codegen_example_generated.h" #include @@ -39,7 +43,7 @@ #define HEIGHT (800) static void -_on_delete(Ecore_Evas *ee) +_on_delete(Ecore_Evas *ee EINA_UNUSED) { ecore_main_loop_quit(); } @@ -56,11 +60,10 @@ _columns_rows_print(Evas_Object *edje_obj) } static void -_on_mouse_over(void *data, Evas_Object *obj, const char *emission, +_on_mouse_over(void *data EINA_UNUSED, Evas_Object *obj, const char *emission, const char *source) { Evas_Object *rect; - Eina_Bool disabled; static int i = 0; printf("Mouse over, source: %s - emission: %s\n", @@ -72,7 +75,7 @@ _on_mouse_over(void *data, Evas_Object *obj, const char *emission, } if (i++ == 5) { - Evas_Object *rect = codegen_example_part_two_get(obj); + rect = codegen_example_part_two_get(obj); evas_object_color_set(rect, 0, 255, 0, 255); codegen_example_part_below_over_callback_del_full(obj,_on_mouse_over, NULL); @@ -97,17 +100,14 @@ _rect_create(Evas *e, unsigned char r, unsigned char g, unsigned char b) } int -main(int argc, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "codegen.edj", *aux; + const char *edje_file = PACKAGE_DATA_DIR"/codegen.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; Evas_Object *red_rect, *yellow_rect, *blue_rect, *rects[4]; - Eina_Prefix *pfx; - Eina_Bool disabled; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -115,25 +115,10 @@ main(int argc, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Edje codegen Example"); @@ -145,7 +130,7 @@ main(int argc, char *argv[]) evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */ ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE); - edje_obj = codegen_example_object_add(evas, edje_file_path); + edje_obj = codegen_example_object_add(evas, edje_file); evas_object_resize(edje_obj, WIDTH, HEIGHT); evas_object_show(edje_obj); @@ -184,15 +169,12 @@ main(int argc, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-color-class.c b/src/examples/edje/edje-color-class.c index 883e258923..a4a5a1e9a2 100644 --- a/src/examples/edje/edje-color-class.c +++ b/src/examples/edje/edje-color-class.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -210,9 +214,7 @@ _create_windows(const char *edje_file_path) int main(int argc, char *argv[]) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "color-class.edj"; - Eina_Prefix *pfx; + const char *edje_file = PACKAGE_DATA_DIR"/color-class.edj"; color c1, c2, c3; int i; @@ -242,21 +244,7 @@ main(int argc, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - if (!_create_windows(edje_file_path)) - goto free_prefix; + if (!_create_windows(edje_file)) goto shutdown_edje; edje_color_class_set(argv[1], /* class name */ c1[0], c1[1], c1[2], c1[3], /* Object color */ @@ -277,15 +265,12 @@ main(int argc, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee1); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-drag.c b/src/examples/edje/edje-drag.c index 6b3f6b22aa..da7504f07c 100644 --- a/src/examples/edje/edje-drag.c +++ b/src/examples/edje/edje-drag.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -118,15 +122,13 @@ _on_knob_moved(void *data EINA_UNUSED, Evas_Object *o, const char *emission EINA } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "drag.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/drag.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -134,22 +136,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_destroy_set(ee, _on_destroy); ecore_evas_callback_resize_set(ee, _on_canvas_resize); @@ -168,9 +158,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "example/group"); + edje_object_file_set(edje_obj, edje_file, "example/group"); evas_object_move(edje_obj, 0, 0); evas_object_resize(edje_obj, WIDTH, HEIGHT); evas_object_show(edje_obj); @@ -192,15 +180,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-multisense.c b/src/examples/edje/edje-multisense.c index c66c5681b7..5de3ae8b14 100644 --- a/src/examples/edje/edje-multisense.c +++ b/src/examples/edje/edje-multisense.c @@ -5,7 +5,7 @@ * buffer one) and multisense support ine edje. See stdout/stderr for output. * * @verbatim - * gcc -o edje-multisense edje-multisense.c `pkg-config --libs --cflags eina evas ecore ecore-evas edje` + * edje_cc multisense.edc && gcc -o edje-multisense edje-multisense.c `pkg-config --libs --cflags eina evas ecore ecore-evas edje` * @endverbatim */ @@ -15,6 +15,10 @@ #include #include +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #define WIDTH 300 #define HEIGHT 300 @@ -29,7 +33,8 @@ static Evas_Object *create_my_group(Evas *canvas) return NULL; } - if (!edje_object_file_set(edje, "multisense.edj", "example_group")) + if (!edje_object_file_set(edje, PACKAGE_DATA_DIR"/multisense.edj", + "example_group")) { int err = edje_object_load_error_get(edje); const char *errmsg = edje_load_error_str(err); diff --git a/src/examples/edje/edje-perspective.c b/src/examples/edje/edje-perspective.c index dbb3e2268f..dc8c248fe8 100644 --- a/src/examples/edje/edje-perspective.c +++ b/src/examples/edje/edje-perspective.c @@ -1,11 +1,11 @@ /** - * Simple Edje example illustrating drag functions. + * Simple Edje example illustrating perspective functions. * * You'll need at least one Evas engine built for it (excluding the * buffer one). See stdout/stderr for output. * * @verbatim - * edje_cc drag.edc && gcc -o drag-box drag-box.c `pkg-config --libs --cflags evas ecore ecore-evas edje` + * edje_cc perspective.edc && gcc -o edje-perspective edje-perspective.c `pkg-config --libs --cflags evas ecore ecore-evas edje` * @endverbatim */ @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -159,14 +163,12 @@ _animation_end_cb(void *data, Evas_Object *o EINA_UNUSED, const char *emission E } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "perspective.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/perspective.edj"; struct _App app; Ecore_Evas *ee; Evas *evas; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -174,17 +176,6 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - edje_frametime_set(1.0 / 60.0); /* this will give you a window with an Evas canvas under the first @@ -195,8 +186,7 @@ main(int argc EINA_UNUSED, char *argv[]) app.focal = 50; ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_destroy_set(ee, _on_destroy); ecore_evas_callback_resize_set(ee, _on_canvas_resize); @@ -216,9 +206,7 @@ main(int argc EINA_UNUSED, char *argv[]) app.edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(app.edje_obj, edje_file_path, "example/group"); + edje_object_file_set(app.edje_obj, edje_file, "example/group"); evas_object_move(app.edje_obj, 0, 0); evas_object_resize(app.edje_obj, WIDTH, HEIGHT); evas_object_show(app.edje_obj); @@ -235,15 +223,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-signals-messages.c b/src/examples/edje/edje-signals-messages.c index 380d1e5861..b9b5f347e0 100644 --- a/src/examples/edje/edje-signals-messages.c +++ b/src/examples/edje/edje-signals-messages.c @@ -5,7 +5,7 @@ * buffer one). See stdout/stderr for output. * * @verbatim - * gcc -o edje-signals-messages edje-signals-messages.c `pkg-config --libs --cflags evas ecore ecore-evas edje` + * edje_cc signals-messages.edc && gcc -o edje-signals-messages edje-signals-messages.c `pkg-config --libs --cflags evas ecore ecore-evas edje` * @endverbatim */ @@ -16,6 +16,10 @@ #define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -138,17 +142,15 @@ _message_handle(void *data EINA_UNUSED, } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char border_img_path[PATH_MAX]; - char edje_file_path[PATH_MAX]; - const char *edje_file = "signals-messages.edj"; + const char *img_file = PACKAGE_DATA_DIR"/red.png"; + const char *edje_file = PACKAGE_DATA_DIR"/signals-messages.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; Evas_Object *border; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -156,22 +158,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Edje Basics Example"); @@ -188,9 +178,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - if (!edje_object_file_set(edje_obj, edje_file_path, "example_group")) + if (!edje_object_file_set(edje_obj, edje_file, "example_group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); @@ -198,7 +186,7 @@ main(int argc EINA_UNUSED, char *argv[]) "signals-messages.edj: %s\n", errmsg); evas_object_del(edje_obj); - goto free_prefix; + goto shutdown_edje; } edje_object_signal_callback_add(edje_obj, "mouse,wheel,*", "part_left", @@ -215,13 +203,10 @@ main(int argc EINA_UNUSED, char *argv[]) evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, edje_obj); - snprintf(border_img_path, sizeof(border_img_path), - "%s/edje/examples/red.png", eina_prefix_data_get(pfx)); - /* this is a border around the Edje object above, here just to * emphasize its geometry */ border = evas_object_image_filled_add(evas); - evas_object_image_file_set(border, border_img_path, NULL); + evas_object_image_file_set(border, img_file, NULL); evas_object_image_border_set(border, 2, 2, 2, 2); evas_object_image_border_center_fill_set(border, EVAS_BORDER_FILL_NONE); @@ -236,15 +221,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-swallow.c b/src/examples/edje/edje-swallow.c index 4769cc19cf..2b93ce0cc5 100644 --- a/src/examples/edje/edje-swallow.c +++ b/src/examples/edje/edje-swallow.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -43,17 +47,15 @@ _on_canvas_resize(Ecore_Evas *ee) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "swallow.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/swallow.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *rect; Evas_Object *obj; Evas_Object *edje_obj; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -61,22 +63,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_callback_resize_set(ee, _on_canvas_resize); @@ -93,9 +83,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "example_group"); + edje_object_file_set(edje_obj, edje_file, "example_group"); evas_object_move(edje_obj, 20, 20); evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj); @@ -112,15 +100,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-swallow2.c b/src/examples/edje/edje-swallow2.c index 884578ce3f..fe3f95632d 100644 --- a/src/examples/edje/edje-swallow2.c +++ b/src/examples/edje/edje-swallow2.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -29,19 +33,16 @@ _on_delete(Ecore_Evas *ee EINA_UNUSED) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - char img_file_path[PATH_MAX]; - const char *edje_file = "swallow.edj"; - const char *img_file = "bubble.png"; + const char *edje_file = PACKAGE_DATA_DIR"/swallow.edj"; + const char *img_file = PACKAGE_DATA_DIR"/bubble.png"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *img; Evas_Object *obj; Evas_Object *edje_obj; - Eina_Prefix *pfx; Evas_Load_Error err; if (!ecore_evas_init()) @@ -50,22 +51,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); @@ -84,26 +73,21 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "example_group"); + edje_object_file_set(edje_obj, edje_file, "example_group"); evas_object_move(edje_obj, 20, 20); evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj); - snprintf(img_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), img_file); - img = evas_object_image_filled_add(evas); - evas_object_image_file_set(img, img_file_path, NULL); + evas_object_image_file_set(img, img_file, NULL); err = evas_object_image_load_error_get(img); if (err != EVAS_LOAD_ERROR_NONE) { fprintf(stderr, "could not load image '%s'. error string is \"%s\"\n", - img_file_path, evas_load_error_str(err)); - goto free_prefix; + img_file, evas_load_error_str(err)); + goto shutdown_edje; } edje_object_part_swallow(edje_obj, "part_one", img); @@ -117,15 +101,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-table.c b/src/examples/edje/edje-table.c index 51042d26d7..965a0f43d7 100644 --- a/src/examples/edje/edje-table.c +++ b/src/examples/edje/edje-table.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -103,16 +107,14 @@ _rects_create(Evas *evas, Evas_Object **rects, Evas_Object *edje_obj) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "table.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/table.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; Evas_Object *rects[4]; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -120,22 +122,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_callback_resize_set(ee, _on_canvas_resize); @@ -152,9 +142,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "example_table"); + edje_object_file_set(edje_obj, edje_file, "example_table"); evas_object_move(edje_obj, 0, 0); /* at canvas' origin */ evas_object_resize(edje_obj, WIDTH, HEIGHT); evas_object_show(edje_obj); @@ -192,15 +180,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje-text.c b/src/examples/edje/edje-text.c index 5bfaaa4f25..8242ea90d0 100644 --- a/src/examples/edje/edje-text.c +++ b/src/examples/edje/edje-text.c @@ -15,6 +15,10 @@ # define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -35,15 +39,13 @@ _on_text_change(void *data EINA_UNUSED, Evas_Object *obj, const char *part) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char edje_file_path[PATH_MAX]; - const char *edje_file = "text.edj"; + const char *edje_file = PACKAGE_DATA_DIR"/text.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *edje_obj; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -51,22 +53,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Edje text Example"); @@ -82,9 +72,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - edje_object_file_set(edje_obj, edje_file_path, "example_group"); + edje_object_file_set(edje_obj, edje_file, "example_group"); evas_object_move(edje_obj, 20, 20); evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj); @@ -103,15 +91,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/edje/edje_example.c b/src/examples/edje/edje_example.c index 103e867f12..a39a082c62 100644 --- a/src/examples/edje/edje_example.c +++ b/src/examples/edje/edje_example.c @@ -1,9 +1,16 @@ +//Compile with: +// edje_cc edje_example.edc && gcc -o edje_example edje_example.c `pkg-config --libs --cflags ecore ecore-evas edje` + #include #include #include #include #include +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #define WIDTH 320 #define HEIGHT 240 @@ -18,7 +25,8 @@ static Evas_Object *create_my_group(Evas *canvas, const char *text) return NULL; } - if (!edje_object_file_set(edje, "edje_example.edj", "my_group")) + if (!edje_object_file_set(edje, PACKAGE_DATA_DIR"/edje_example.edj", + "my_group")) { int err = edje_object_load_error_get(edje); const char *errmsg = edje_load_error_str(err); diff --git a/src/examples/edje/signals2.c b/src/examples/edje/signals2.c index b43b8878c8..61b6a77c91 100644 --- a/src/examples/edje/signals2.c +++ b/src/examples/edje/signals2.c @@ -1,3 +1,6 @@ +//Compile with: +// edje_cc signalsBubble.edc && gcc -o signals2 signals2.c `pkg-config --libs --cflags ecore ecore-evas edje` + #ifdef HAVE_CONFIG_H #include "config.h" #else @@ -5,6 +8,10 @@ #define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -56,11 +63,9 @@ _on_mouse_over(void *data, Evas_Object *edje_obj, } int -main(int argc EINA_UNUSED, char **argv) +main(int argc EINA_UNUSED, char **argv EINA_UNUSED) { - const char *edje_file = "signalsBubble.edj"; - char edje_file_path[PATH_MAX]; - Eina_Prefix *pfx; + const char *edje_file = PACKAGE_DATA_DIR"/signalsBubble.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; @@ -70,15 +75,9 @@ main(int argc EINA_UNUSED, char **argv) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, "EDJE_EXAMPLES", "edje/examples", - edje_file, PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); - - if (!pfx) goto shutdown_edje; - ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) goto eina_prefix_free; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Edje animations and signals"); @@ -96,15 +95,12 @@ main(int argc EINA_UNUSED, char **argv) edje_obj = edje_object_add(evas); - snprintf(edje_file_path, sizeof(edje_file_path), "%s/examples/%s", - eina_prefix_data_get(pfx), edje_file); - - if (!edje_object_file_set(edje_obj, edje_file_path, "image_group")) + if (!edje_object_file_set(edje_obj, edje_file, "image_group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); fprintf(stderr, "Could not load the edje file - reason:%s\n", errmsg); - goto eina_prefix_free; + goto shutdown_edje; } edje_object_signal_callback_add(edje_obj, "mouse,move", "part_image", @@ -117,15 +113,12 @@ main(int argc EINA_UNUSED, char **argv) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); edje_shutdown(); ecore_evas_shutdown(); return EXIT_SUCCESS; - eina_prefix_free: eina_prefix_free(pfx); - shutdown_edje: edje_shutdown(); shutdown_ecore_evas: ecore_evas_shutdown(); diff --git a/src/examples/edje/sigtest.c b/src/examples/edje/sigtest.c index 08300a213d..2d600fff98 100644 --- a/src/examples/edje/sigtest.c +++ b/src/examples/edje/sigtest.c @@ -1,3 +1,6 @@ +//Compile with: +// edje_cc sigtest.edc && gcc -o sigtest sigtest.c `pkg-config --libs --cflags ecore ecore-evas edje` + #ifdef HAVE_CONFIG_H #include "config.h" #else @@ -5,6 +8,10 @@ #define EINA_UNUSED #endif +#ifndef PACKAGE_DATA_DIR +#define PACKAGE_DATA_DIR "." +#endif + #include #include #include @@ -31,12 +38,12 @@ _on_keydown(void *data, Ecore_Evas *ee; Evas_Event_Key_Down *ev; Evas_Object *edje_obj; - char *edje_file_path; + char *edje_file; ee = (Ecore_Evas *)data; ev = (Evas_Event_Key_Down *)einfo; edje_obj = ecore_evas_data_get(ee, "edje_obj"); - edje_file_path = ecore_evas_data_get(ee, "file_path"); + edje_file = ecore_evas_data_get(ee, "file"); if (!strcmp(ev->keyname, "h")) { @@ -45,7 +52,7 @@ _on_keydown(void *data, } else if (!strcmp(ev->keyname, "e")) { - if (!edje_object_file_set(edje_obj, edje_file_path, "plain/edje/group")) + if (!edje_object_file_set(edje_obj, edje_file, "plain/edje/group")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); @@ -59,7 +66,7 @@ _on_keydown(void *data, } else if (!strcmp(ev->keyname, "l")) { - if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base")) + if (!edje_object_file_set(edje_obj, edje_file, "lua_base")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); @@ -225,17 +232,15 @@ _on_delete(Ecore_Evas *ee EINA_UNUSED) } int -main(int argc EINA_UNUSED, char *argv[]) +main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { - char border_img_path[PATH_MAX]; - char edje_file_path[PATH_MAX]; - const char *edje_file = "sigtest.edj"; + const char *img_file = PACKAGE_DATA_DIR"/red.png"; + const char *edje_file = PACKAGE_DATA_DIR"/sigtest.edj"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; Evas_Object *border; Evas_Object *edje_obj; - Eina_Prefix *pfx; if (!ecore_evas_init()) return EXIT_FAILURE; @@ -243,22 +248,10 @@ main(int argc EINA_UNUSED, char *argv[]) if (!edje_init()) goto shutdown_ecore_evas; - pfx = eina_prefix_new(argv[0], main, - "EDJE_EXAMPLES", - "edje/examples", - edje_file, - PACKAGE_BIN_DIR, - PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, - PACKAGE_DATA_DIR); - if (!pfx) - goto shutdown_edje; - /* this will give you a window with an Evas canvas under the first * engine available */ ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); - if (!ee) - goto free_prefix; + if (!ee) goto shutdown_edje; ecore_evas_callback_delete_request_set(ee, _on_delete); ecore_evas_title_set(ee, "Signals and wessages tester"); @@ -279,9 +272,7 @@ main(int argc EINA_UNUSED, char *argv[]) edje_object_message_handler_set(edje_obj, _on_message, NULL); edje_object_signal_callback_add(edje_obj, "*", "*", _on_signal, NULL); - snprintf(edje_file_path, sizeof(edje_file_path), - "%s/examples/%s", eina_prefix_data_get(pfx), edje_file); - if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base")) + if (!edje_object_file_set(edje_obj, edje_file, "lua_base")) { int err = edje_object_load_error_get(edje_obj); const char *errmsg = edje_load_error_str(err); @@ -289,7 +280,7 @@ main(int argc EINA_UNUSED, char *argv[]) errmsg); evas_object_del(edje_obj); - goto free_prefix; + goto shutdown_edje; } fprintf(stdout, "Loaded Edje object bound to group 'lua_base' from" @@ -299,17 +290,14 @@ main(int argc EINA_UNUSED, char *argv[]) evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj); ecore_evas_data_set(ee, "edje_obj", edje_obj); - ecore_evas_data_set(ee, "file_path", edje_file_path); + ecore_evas_data_set(ee, "file", edje_file); evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, ee); - snprintf(border_img_path, sizeof(border_img_path), - "%s/edje/examples/red.png", eina_prefix_data_get(pfx)); - /* this is a border around the Edje object above, here just to * emphasize its geometry */ border = evas_object_image_filled_add(evas); - evas_object_image_file_set(border, border_img_path, NULL); + evas_object_image_file_set(border, img_file, NULL); evas_object_image_border_set(border, 2, 2, 2, 2); evas_object_image_border_center_fill_set(border, EVAS_BORDER_FILL_NONE); @@ -323,15 +311,12 @@ main(int argc EINA_UNUSED, char *argv[]) ecore_main_loop_begin(); - eina_prefix_free(pfx); ecore_evas_free(ee); ecore_evas_shutdown(); edje_shutdown(); return EXIT_SUCCESS; - free_prefix: - eina_prefix_free(pfx); shutdown_edje: edje_shutdown(); shutdown_ecore_evas: diff --git a/src/examples/eet/eet-basic.c b/src/examples/eet/eet-basic.c index 05ff397789..acd61a4f4e 100644 --- a/src/examples/eet/eet-basic.c +++ b/src/examples/eet/eet-basic.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o eet-basic eet-basic.c `pkg-config --cflags --libs eet` + #include int diff --git a/src/examples/eet/eet-data-cipher_decipher.c b/src/examples/eet/eet-data-cipher_decipher.c index 2ef965c745..1708b78144 100644 --- a/src/examples/eet/eet-data-cipher_decipher.c +++ b/src/examples/eet/eet-data-cipher_decipher.c @@ -1,6 +1,5 @@ -/* - * build: gcc -o eet_data_file_cipher_decipher eet-data-file_cipher_decipher.c `pkg-config --cflags --libs eet eina` - */ +//Compile with: +// gcc -o eet-data-cipher_decipher eet-data-cipher_decipher.c `pkg-config --cflags --libs eet eina` #include #include diff --git a/src/examples/eet/eet-data-file_descriptor_01.c b/src/examples/eet/eet-data-file_descriptor_01.c index 4b5b75f865..be43df93da 100644 --- a/src/examples/eet/eet-data-file_descriptor_01.c +++ b/src/examples/eet/eet-data-file_descriptor_01.c @@ -1,6 +1,6 @@ -/* - * build: gcc -o eet_data_file_descriptor eet-data-file_descriptor.c `pkg-config --cflags --libs eet eina` - */ +//Compile with: +// gcc -o eet-data-file_descriptor_01 eet-data-file_descriptor_01.c `pkg-config --cflags --libs eet eina` + #include #include #include diff --git a/src/examples/eet/eet-data-file_descriptor_02.c b/src/examples/eet/eet-data-file_descriptor_02.c index 65ba79ec40..bfd34d13e4 100644 --- a/src/examples/eet/eet-data-file_descriptor_02.c +++ b/src/examples/eet/eet-data-file_descriptor_02.c @@ -1,6 +1,5 @@ -/* - * build: gcc -o eet_data_file_descriptor_02 eet-data-file_descriptor_02.c `pkg-config --cflags --libs eet eina` - */ +//Compile with: +// gcc -o eet-data-file_descriptor_02 eet-data-file_descriptor_02.c `pkg-config --cflags --libs eet eina` #include #include diff --git a/src/examples/eet/eet-data-nested.c b/src/examples/eet/eet-data-nested.c index a6b0e1208a..cfded408ce 100644 --- a/src/examples/eet/eet-data-nested.c +++ b/src/examples/eet/eet-data-nested.c @@ -1,6 +1,6 @@ -/* - * build: gcc -o eet_data_nested eet-data-nested.c `pkg-config --cflags --libs eet eina` - */ +//Compile with: +// gcc -o eet-data-nested eet-data-nested.c `pkg-config --cflags --libs eet eina` + #include #include #include diff --git a/src/examples/eet/eet-data-simple.c b/src/examples/eet/eet-data-simple.c index 1951fc012b..3931e835f3 100644 --- a/src/examples/eet/eet-data-simple.c +++ b/src/examples/eet/eet-data-simple.c @@ -1,6 +1,6 @@ -/* - * build: gcc -o eet_data_simple eet-data-simple.c `pkg-config --cflags --libs eet eina` - */ +//Compile with: +// gcc -o eet-data-simple eet-data-simple.c `pkg-config --cflags --libs eet eina` + #include #include #include diff --git a/src/examples/eet/eet-file.c b/src/examples/eet/eet-file.c index 740c179f7b..9b64425b0a 100644 --- a/src/examples/eet/eet-file.c +++ b/src/examples/eet/eet-file.c @@ -1,6 +1,6 @@ -/* - * build: gcc -o eet_file eet-file.c `pkg-config --cflags --libs eet` - */ +//Compile with: +// gcc -o eet-file eet-file.c `pkg-config --cflags --libs eet` + #include #include #include diff --git a/src/examples/eina/eina_simple_xml_parser_01.c b/src/examples/eina/eina_simple_xml_parser_01.c index e85f2f0615..ff217c0f68 100644 --- a/src/examples/eina/eina_simple_xml_parser_01.c +++ b/src/examples/eina/eina_simple_xml_parser_01.c @@ -1,5 +1,5 @@ //Compile with: -//gcc -Wall -o eina_simple_xml_01 eina_simple_xml_01.c `pkg-config --cflags --libs eina` +//gcc -Wall -o eina_simple_xml_parser_01 eina_simple_xml_parser_01.c `pkg-config --cflags --libs eina` #include #include diff --git a/src/examples/eina/eina_xattr_01.c b/src/examples/eina/eina_xattr_01.c index c26c441941..c739dfe842 100644 --- a/src/examples/eina/eina_xattr_01.c +++ b/src/examples/eina/eina_xattr_01.c @@ -1,5 +1,5 @@ //Compile with: -//gcc -g eina_xattr_02.c -o eina_xattr_02 `pkg-config --cflags --libs eina` +//gcc -g eina_xattr_01.c -o eina_xattr_01 `pkg-config --cflags --libs eina` #include diff --git a/src/examples/eio/eio_file_copy.c b/src/examples/eio/eio_file_copy.c index 7704cfcac7..72da1b7e4b 100644 --- a/src/examples/eio/eio_file_copy.c +++ b/src/examples/eio/eio_file_copy.c @@ -1,6 +1,5 @@ -/** - * Compile with gcc -o eio_file_copy eio_file_copy.c `pkg-config --cflags --libs ecore eio` - */ +//Compile with: +//gcc -o eio_file_copy eio_file_copy.c `pkg-config --cflags --libs ecore eio` #include #include diff --git a/src/examples/eio/eio_file_ls.c b/src/examples/eio/eio_file_ls.c index 7a9e7f548b..795e80bf4a 100644 --- a/src/examples/eio/eio_file_ls.c +++ b/src/examples/eio/eio_file_ls.c @@ -1,6 +1,5 @@ -/** - * Compile with gcc -o eio_file_ls eio_file_ls.c `pkg-config --cflags --libs ecore eio` - */ +//Compile with: +//gcc -o eio_file_ls eio_file_ls.c `pkg-config --cflags --libs ecore eio` #include #include diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c index 7e3e4c2e4b..df3ce15cb4 100644 --- a/src/examples/emotion/emotion_basic_example.c +++ b/src/examples/emotion/emotion_basic_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o emotion_basic_example emotion_basic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas` + #include #include #include diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c index 9df53f4333..5fa6f0f130 100644 --- a/src/examples/emotion/emotion_border_example.c +++ b/src/examples/emotion/emotion_border_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o emotion_border_example emotion_border_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina` + #include #include #include diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c index b8382862d5..580cae9821 100644 --- a/src/examples/emotion/emotion_generic_example.c +++ b/src/examples/emotion/emotion_generic_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o emotion_generic_example emotion_generic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina` + #include #include #include diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c index 448b505449..fcdf177d02 100644 --- a/src/examples/emotion/emotion_generic_subtitle_example.c +++ b/src/examples/emotion/emotion_generic_subtitle_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o emotion_generic_subtitle_example emotion_generic_subtitle_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas` + #include #include #include diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c index 2469c468ba..efba9ffe5f 100644 --- a/src/examples/emotion/emotion_signals_example.c +++ b/src/examples/emotion/emotion_signals_example.c @@ -1,3 +1,6 @@ +//Compile with: +// gcc -o emotion_signals_example emotion_signals_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas` + #include #include #include diff --git a/src/examples/ethumb_client/ethumb_dbus.c b/src/examples/ethumb_client/ethumb_dbus.c index 2f613e93ea..aa3b2f59a9 100644 --- a/src/examples/ethumb_client/ethumb_dbus.c +++ b/src/examples/ethumb_client/ethumb_dbus.c @@ -17,6 +17,8 @@ * License along with this library; * if not, see . * + * gcc -o ethumb_dbus ethumb_dbus.c `pkg-config --libs --cflags eina ecore ethumb ethumb_client` + * * @author Rafael Antognolli */ #ifdef HAVE_CONFIG_H diff --git a/src/examples/evas/evas-aspect-hints.c b/src/examples/evas/evas-aspect-hints.c index be301cbce1..0d81027075 100644 --- a/src/examples/evas/evas-aspect-hints.c +++ b/src/examples/evas/evas-aspect-hints.c @@ -9,7 +9,8 @@ * object implementing aspect control for children. * * @verbatim - * gcc -o evas-events evas-events.c `pkg-config --libs --cflags ecore-evas edje` + * edje_cc aspect.edc + * gcc -o evas-aspect-hints evas-aspect-hints.c `pkg-config --libs --cflags evas ecore ecore-evas edje` * @endverbatim */ diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c index d88924b0e0..8cfbdb1b00 100644 --- a/src/examples/evas/evas-hints.c +++ b/src/examples/evas/evas-hints.c @@ -10,7 +10,7 @@ * output. * * @verbatim - * gcc -o evas-events evas-events.c `pkg-config --libs --cflags ecore-evas` + * gcc -o evas-hints evas-hints.c `pkg-config --libs --cflags evas ecore ecore-evas` * @endverbatim */ diff --git a/src/examples/evas/evas-images3.c b/src/examples/evas/evas-images3.c index 1c667728ea..fe35ca3282 100644 --- a/src/examples/evas/evas-images3.c +++ b/src/examples/evas/evas-images3.c @@ -6,7 +6,7 @@ * for output. * * @verbatim - * gcc -o evas-images2 evas-images2.c `pkg-config --libs --cflags evas ecore ecore-evas` + * gcc -o evas-images3 evas-images3.c `pkg-config --libs --cflags evas ecore ecore-evas` * @endverbatim */ diff --git a/src/examples/evas/evas-init-shutdown.c b/src/examples/evas/evas-init-shutdown.c index a7508d8685..eb200893b6 100644 --- a/src/examples/evas/evas-init-shutdown.c +++ b/src/examples/evas/evas-init-shutdown.c @@ -8,8 +8,7 @@ * to. * * @verbatim - * gcc -o evas-init-shutdown evas-init-shutdown.c `pkg-config --libs \ - * --cflags evas` + * gcc -o evas-init-shutdown evas-init-shutdown.c `pkg-config --libs --cflags evas` * @endverbatim * */ diff --git a/src/examples/evas/evas-map-utils.c b/src/examples/evas/evas-map-utils.c index 78fdd68201..30eb052b34 100644 --- a/src/examples/evas/evas-map-utils.c +++ b/src/examples/evas/evas-map-utils.c @@ -1,6 +1,14 @@ -/* +/** + * Simple Evas example illustrating basic map utils. + * + * You'll need at least one engine built for it (excluding the buffer + * one). See stdout/stderr for output. + * + * @verbatim * gcc -o evas-map-utils evas-map-utils.c `pkg-config --cflags --libs evas ecore ecore-evas` + * @endverbatim */ + #ifdef HAVE_CONFIG_H #include "config.h" #else diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c index 99f1064d9a..2fc5c8d887 100644 --- a/src/examples/evas/evas-object-manipulation-eo.c +++ b/src/examples/evas/evas-object-manipulation-eo.c @@ -9,7 +9,7 @@ * output. * * @verbatim - * gcc -o evas-object-manipulation-eo evas-object-manipulation-eo.c `pkg-config --libs --cflags ecore evas ecore-evas` + * gcc -o evas-object-manipulation-eo evas-object-manipulation-eo.c `pkg-config --libs --cflags ecore evas ecore-evas eo` * @endverbatim */ diff --git a/src/examples/evas/evas-stacking.c b/src/examples/evas/evas-stacking.c index d8e60d6eaa..67e85c1ca7 100644 --- a/src/examples/evas/evas-stacking.c +++ b/src/examples/evas/evas-stacking.c @@ -7,7 +7,7 @@ * output. * * @verbatim - * gcc -o evas-stacking evas-stacking.c `pkg-config --libs --cflags evas ecore ecore-evas edje` + * gcc -o evas-stacking evas-stacking.c `pkg-config --libs --cflags evas ecore ecore-evas` * @endverbatim */ diff --git a/src/examples/evas/evas-table.c b/src/examples/evas/evas-table.c index 8aa2b5e3ec..f3f5d6cd17 100644 --- a/src/examples/evas/evas-table.c +++ b/src/examples/evas/evas-table.c @@ -5,7 +5,7 @@ * one) and the png image loader also built. * * @verbatim - * gcc -o evas-table evas-table.c `pkg-config --libs --cflags ecore-evas` + * gcc -o evas-table evas-table.c `pkg-config --libs --cflags evas ecore ecore-evas` * @endverbatim */