summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2013-12-01 16:59:21 +0000
committerJérémy Zurcher <jeremy@asynk.ch>2013-12-01 16:59:21 +0000
commit18eb4d188d492e3be543bf9f5e8640c137243574 (patch)
tree60626839f4f723fe5089787e78602fcd174ad461
parentb865f9c2f39faaabf2fce779c7e6c6f8ade3e972 (diff)
app: elm_skel -> my_app
-rw-r--r--app/COPYING2
-rw-r--r--app/Makefile.am12
-rw-r--r--app/NEWS2
-rw-r--r--app/README2
-rw-r--r--app/TODO4
-rw-r--r--app/configure.ac42
-rw-r--r--app/data/desktop/Makefile.am6
-rw-r--r--app/data/desktop/my_app.desktop.in (renamed from app/data/desktop/elm_skel.desktop.in)6
-rw-r--r--app/data/desktop/my_app.png (renamed from app/data/desktop/elm_skel.png)bin5938 -> 5938 bytes
-rw-r--r--app/my_app.pc.in (renamed from app/elm_skel.pc.in)8
-rw-r--r--app/src/Makefile.am6
-rw-r--r--app/src/Makefile_bin.am10
-rw-r--r--app/src/Makefile_lib.am28
-rw-r--r--app/src/bin/app.c6
-rw-r--r--app/src/bin/app.h20
-rw-r--r--app/src/bin/gui.c2
-rw-r--r--app/src/bin/main.c12
-rw-r--r--app/src/lib/Lib.h18
-rw-r--r--app/src/lib/lib.c36
-rw-r--r--app/src/lib/lib_private.h18
-rw-r--r--app/src/tests/my_app_suite.c (renamed from app/src/tests/elm_skel_suite.c)20
21 files changed, 130 insertions, 130 deletions
diff --git a/app/COPYING b/app/COPYING
index 0e8ece2..f979077 100644
--- a/app/COPYING
+++ b/app/COPYING
@@ -1,4 +1,4 @@
1Copyright notice for elm_skel: 1Copyright notice for my_app:
2 2
3Copyright (C) 2013 Jérémy Zurcher <jeremy@asynk.ch> 3Copyright (C) 2013 Jérémy Zurcher <jeremy@asynk.ch>
4 and various contributors (see AUTHORS). 4 and various contributors (see AUTHORS).
diff --git a/app/Makefile.am b/app/Makefile.am
index 4df99ba..530973f 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = \
35 AUTHORS \ 35 AUTHORS \
36 COPYING \ 36 COPYING \
37 autogen.sh \ 37 autogen.sh \
38 elm_skel.pc.in \ 38 my_app.pc.in \
39 m4/efl_attribute.m4 \ 39 m4/efl_attribute.m4 \
40 m4/efl_compiler.m4 \ 40 m4/efl_compiler.m4 \
41 m4/efl_path_max.m4 \ 41 m4/efl_path_max.m4 \
@@ -43,12 +43,12 @@ EXTRA_DIST = \
43 m4/project_init.m4 43 m4/project_init.m4
44 44
45pkgconfigdir = $(libdir)/pkgconfig 45pkgconfigdir = $(libdir)/pkgconfig
46pkgconfig_DATA = elm_skel.pc 46pkgconfig_DATA = my_app.pc
47 47
48 48
49# Unit tests 49# Unit tests
50 50
51if ELM_SKEL_ENABLE_COVERAGE 51if MY_APP_ENABLE_COVERAGE
52 52
53lcov-reset: 53lcov-reset:
54 @rm -rf $(top_builddir)/coverage 54 @rm -rf $(top_builddir)/coverage
@@ -65,14 +65,14 @@ lcov-report:
65 65
66endif 66endif
67 67
68if ELM_SKEL_ENABLE_TESTS 68if MY_APP_ENABLE_TESTS
69 69
70lcov-check: 70lcov-check:
71if ELM_SKEL_ENABLE_COVERAGE 71if MY_APP_ENABLE_COVERAGE
72 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 72 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
73endif 73endif
74 @$(MAKE) $(AM_MAKEFLAGS) check 74 @$(MAKE) $(AM_MAKEFLAGS) check
75if ELM_SKEL_ENABLE_COVERAGE 75if MY_APP_ENABLE_COVERAGE
76 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 76 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
77endif 77endif
78 78
diff --git a/app/NEWS b/app/NEWS
index 0ab7089..3bda25a 100644
--- a/app/NEWS
+++ b/app/NEWS
@@ -1,3 +1,3 @@
1elm_skel 0.0.1 1my_app 0.0.1
2 2
3 * Initial version 3 * Initial version
diff --git a/app/README b/app/README
index dc7833f..418941c 100644
--- a/app/README
+++ b/app/README
@@ -1,4 +1,4 @@
1elm_skel 0.0.1 1my_app 0.0.1
2 2
3****************************************************************************** 3******************************************************************************
4 4
diff --git a/app/TODO b/app/TODO
index da705a3..c607967 100644
--- a/app/TODO
+++ b/app/TODO
@@ -1,6 +1,6 @@
1- quicklaunch 1- quicklaunch
2- library 2- library
3- elm_skel.pc.in 3- my_app.pc.in
4- build profile 4- build profile
5- tests 5- tests
6- lcov 6- lcov
@@ -14,4 +14,4 @@
14+ application icon 14+ application icon
15+ doxygen 15+ doxygen
16+ gettext 16+ gettext
17+ elm_skel.spec.in 17+ my_app.spec.in
diff --git a/app/configure.ac b/app/configure.ac
index 2814328..6444762 100644
--- a/app/configure.ac
+++ b/app/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
4rm -f config.cache 4rm -f config.cache
5 5
6PROJECT_VERSION([0], [0], [1], [dev]) 6PROJECT_VERSION([0], [0], [1], [dev])
7AC_INIT([elm_skel], [v_ver], [jeremy@asynk.ch]) 7AC_INIT([my_app], [v_ver], [jeremy@asynk.ch])
8AC_PREREQ([2.65]) 8AC_PREREQ([2.65])
9AC_CONFIG_SRCDIR([configure.ac]) 9AC_CONFIG_SRCDIR([configure.ac])
10AC_CONFIG_MACRO_DIR([m4]) 10AC_CONFIG_MACRO_DIR([m4])
@@ -109,21 +109,21 @@ AC_SUBST(pkgconfig_requires_private)
109if test "${want_coverage}" = "yes" ; then 109if test "${want_coverage}" = "yes" ; then
110 AC_CHECK_PROG([have_lcov], [lcov], [yes], [no]) 110 AC_CHECK_PROG([have_lcov], [lcov], [yes], [no])
111 if test "x${have_lcov}" = "xyes" ; then 111 if test "x${have_lcov}" = "xyes" ; then
112 ELM_SKEL_COV_CFLAGS="${ELM_SKEL_COV_CFLAGS} -fprofile-arcs -ftest-coverage" 112 MY_APP_COV_CFLAGS="${MY_APP_COV_CFLAGS} -fprofile-arcs -ftest-coverage"
113 ELM_SKEL_COV_LIBS="${ELM_SKEL_COV_LIBS} -lgcov" 113 MY_APP_COV_LIBS="${MY_APP_COV_LIBS} -lgcov"
114 if test "x${prefer_assert}" = "xno"; then 114 if test "x${prefer_assert}" = "xno"; then
115 ELM_SKEL_COV_CFLAGS="${ELM_SKEL_COV_CFLAGS} -DNDEBUG" 115 MY_APP_COV_CFLAGS="${MY_APP_COV_CFLAGS} -DNDEBUG"
116 else 116 else
117 ELM_SKEL_COV_CFLAGS="${ELM_SKEL_COV_CFLAGS} -g -O0 -DDEBUG" 117 MY_APP_COV_CFLAGS="${MY_APP_COV_CFLAGS} -g -O0 -DDEBUG"
118 fi 118 fi
119 else 119 else
120 AC_MSG_ERROR([lcov is not found]) 120 AC_MSG_ERROR([lcov is not found])
121 fi 121 fi
122fi 122fi
123 123
124AC_SUBST(ELM_SKEL_COV_LIBS) 124AC_SUBST(MY_APP_COV_LIBS)
125AC_SUBST(ELM_SKEL_COV_CFLAGS) 125AC_SUBST(MY_APP_COV_CFLAGS)
126AM_CONDITIONAL([ELM_SKEL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"]) 126AM_CONDITIONAL([MY_APP_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"])
127 127
128### Checks for libraries 128### Checks for libraries
129 129
@@ -132,29 +132,29 @@ AM_CONDITIONAL([ELM_SKEL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"])
132if test "${want_tests}" = "yes"; then 132if test "${want_tests}" = "yes"; then
133 PKG_CHECK_MODULES([CHECK], [check >= 0.9.5]) 133 PKG_CHECK_MODULES([CHECK], [check >= 0.9.5])
134fi 134fi
135AM_CONDITIONAL([ELM_SKEL_ENABLE_TESTS], [test "${want_tests}" = "yes"]) 135AM_CONDITIONAL([MY_APP_ENABLE_TESTS], [test "${want_tests}" = "yes"])
136 136
137# Checks for library functions. 137# Checks for library functions.
138 138
139# Evil library for compilation on Windows 139# Evil library for compilation on Windows
140 140
141ELM_SKEL_BUILD="" 141MY_APP_BUILD=""
142case "$host_os" in 142case "$host_os" in
143 mingw*) 143 mingw*)
144 PKG_CHECK_MODULES([EVIL], [evil >= 1.0.0]) 144 PKG_CHECK_MODULES([EVIL], [evil >= 1.0.0])
145 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil library is installed]) 145 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil library is installed])
146 requirement_elm_skel="evil ${requirement_elm_skel}" 146 requirement_my_app="evil ${requirement_my_app}"
147 ELM_SKEL_BUILD="-DELM_SKEL_BUILD" 147 MY_APP_BUILD="-DMY_APP_BUILD"
148 ;; 148 ;;
149esac 149esac
150AC_SUBST(ELM_SKEL_BUILD) 150AC_SUBST(MY_APP_BUILD)
151 151
152# Dependencies for the library 152# Dependencies for the library
153 153
154requirement_elm_skel="elementary >= 1.7.0 evas >= 1.7.0 ecore-file >= 1.7.0 ecore >= 1.7.0 eet >= 1.7.0 eina >= 1.7.0 ${requirement_elm_skel}" 154requirement_my_app="elementary >= 1.7.0 evas >= 1.7.0 ecore-file >= 1.7.0 ecore >= 1.7.0 eet >= 1.7.0 eina >= 1.7.0 ${requirement_my_app}"
155PKG_CHECK_MODULES([EFL], [ $requirement_elm_skel ]) 155PKG_CHECK_MODULES([EFL], [ $requirement_my_app ])
156 156
157AC_SUBST(requirement_elm_skel) 157AC_SUBST(requirement_my_app)
158 158
159# Checks for library functions. 159# Checks for library functions.
160 160
@@ -180,12 +180,12 @@ EFL_ATTRIBUTE_VECTOR
180 180
181case "$host_os" in 181case "$host_os" in
182 mingw32ce*) 182 mingw32ce*)
183 ELM_SKEL_CFLAGS="${ELM_SKEL_CFLAGS} -D_WIN32_WCE=0x0420" 183 MY_APP_CFLAGS="${MY_APP_CFLAGS} -D_WIN32_WCE=0x0420"
184 ;; 184 ;;
185esac 185esac
186 186
187EFL_CHECK_COMPILER_FLAGS([ELM_SKEL], [-Wall -Wunused -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections]) 187EFL_CHECK_COMPILER_FLAGS([MY_APP], [-Wall -Wunused -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections])
188EFL_CHECK_LINKER_FLAGS([ELM_SKEL], [-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries]) 188EFL_CHECK_LINKER_FLAGS([MY_APP], [-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
189 189
190case "${build_profile}" in 190case "${build_profile}" in
191 dev) 191 dev)
@@ -222,12 +222,12 @@ AC_SUBST(lt_enable_auto_import)
222### Output 222### Output
223 223
224AC_OUTPUT([ 224AC_OUTPUT([
225 elm_skel.pc 225 my_app.pc
226 Makefile 226 Makefile
227 src/Makefile 227 src/Makefile
228 data/Makefile 228 data/Makefile
229 data/desktop/Makefile 229 data/desktop/Makefile
230 data/desktop/elm_skel.desktop 230 data/desktop/my_app.desktop
231 data/themes/Makefile 231 data/themes/Makefile
232 data/themes/default/Makefile 232 data/themes/default/Makefile
233]) 233])
diff --git a/app/data/desktop/Makefile.am b/app/data/desktop/Makefile.am
index f76caf5..47bb28d 100644
--- a/app/data/desktop/Makefile.am
+++ b/app/data/desktop/Makefile.am
@@ -1,9 +1,9 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3desktopdir = $(datadir)/applications 3desktopdir = $(datadir)/applications
4desktop_DATA = elm_skel.desktop 4desktop_DATA = my_app.desktop
5 5
6icondir = $(datadir)/icons 6icondir = $(datadir)/icons
7icon_DATA = elm_skel.png 7icon_DATA = my_app.png
8 8
9EXTRA_DIST = elm_skel.desktop.in $(icon_DATA) 9EXTRA_DIST = my_app.desktop.in $(icon_DATA)
diff --git a/app/data/desktop/elm_skel.desktop.in b/app/data/desktop/my_app.desktop.in
index 2f80593..e125061 100644
--- a/app/data/desktop/elm_skel.desktop.in
+++ b/app/data/desktop/my_app.desktop.in
@@ -6,7 +6,7 @@ Name=Elm-Skel
6Name[fr]=Elm-Skel 6Name[fr]=Elm-Skel
7GenericName=Application Skeletion 7GenericName=Application Skeletion
8Comment=ELM Application Skeleton 8Comment=ELM Application Skeleton
9Icon=elm_skel 9Icon=my_app
10TryExec=elm_skel 10TryExec=my_app
11Exec=elm_skel -t default 11Exec=my_app -t default
12Categories=Development;Utility; 12Categories=Development;Utility;
diff --git a/app/data/desktop/elm_skel.png b/app/data/desktop/my_app.png
index c975b9d..c975b9d 100644
--- a/app/data/desktop/elm_skel.png
+++ b/app/data/desktop/my_app.png
Binary files differ
diff --git a/app/elm_skel.pc.in b/app/my_app.pc.in
index 3e73474..293f0aa 100644
--- a/app/elm_skel.pc.in
+++ b/app/my_app.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5vmaj=@VMAJ@ 5vmaj=@VMAJ@
6 6
7Name: elm_skel 7Name: my_app
8Description: This is a source tree skeleton for any elementary based project. 8Description: This is a source tree skeleton for any elementary based project.
9@pkgconfig_requires_private@: @requirement_elm_skel@ 9@pkgconfig_requires_private@: @requirement_my_app@
10Version: @VERSION@ 10Version: @VERSION@
11Libs: -L${libdir} -lelm_skel 11Libs: -L${libdir} -lmy_app
12Cflags: -I${includedir}/elm_skel_app-@VMAJ@ 12Cflags: -I${includedir}/my_app_app-@VMAJ@
diff --git a/app/src/Makefile.am b/app/src/Makefile.am
index d72716c..46850cb 100644
--- a/app/src/Makefile.am
+++ b/app/src/Makefile.am
@@ -15,7 +15,7 @@ check_PROGRAMS =
15TESTS = 15TESTS =
16EXTRA_DIST = 16EXTRA_DIST =
17 17
18ELM_SKEL_INSTALL_DATA_HOOK= 18MY_APP_INSTALL_DATA_HOOK=
19 19
20AM_CPPFLAGS = -I. \ 20AM_CPPFLAGS = -I. \
21 -I$(top_srcdir) \ 21 -I$(top_srcdir) \
@@ -24,8 +24,8 @@ AM_CPPFLAGS = -I. \
24 -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
25 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 25 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
26 @EFL_CFLAGS@ \ 26 @EFL_CFLAGS@ \
27 @ELM_SKEL_CFLAGS@ \ 27 @MY_APP_CFLAGS@ \
28 @ELM_SKEL_COV_CFLAGS@ 28 @MY_APP_COV_CFLAGS@
29 29
30include Makefile_lib.am 30include Makefile_lib.am
31include Makefile_bin.am 31include Makefile_bin.am
diff --git a/app/src/Makefile_bin.am b/app/src/Makefile_bin.am
index e1d6f96..bfa2925 100644
--- a/app/src/Makefile_bin.am
+++ b/app/src/Makefile_bin.am
@@ -1,15 +1,15 @@
1### Binaries 1### Binaries
2 2
3bin_PROGRAMS += bin/elm_skel 3bin_PROGRAMS += bin/my_app
4 4
5bin_elm_skel_SOURCES = \ 5bin_my_app_SOURCES = \
6 bin/main.c \ 6 bin/main.c \
7 bin/app.c \ 7 bin/app.c \
8 bin/gui.c 8 bin/gui.c
9 9
10EXTRA_DIST += bin/app.h 10EXTRA_DIST += bin/app.h
11 11
12bin_elm_skel_LDADD = $(top_builddir)/src/lib/libelm_skel.la 12bin_my_app_LDADD = $(top_builddir)/src/lib/libmy_app.la
13bin_elm_skel_CFLAGS = 13bin_my_app_CFLAGS =
14bin_elm_skel_LDFLAGS = @ELM_SKEL_LDFLAGS@ $(LTLIBINTL) 14bin_my_app_LDFLAGS = @MY_APP_LDFLAGS@ $(LTLIBINTL)
15 15
diff --git a/app/src/Makefile_lib.am b/app/src/Makefile_lib.am
index 5651a4e..cb4c182 100644
--- a/app/src/Makefile_lib.am
+++ b/app/src/Makefile_lib.am
@@ -1,32 +1,32 @@
1### Libraries 1### Libraries
2 2
3includesdir = $(includedir)/elm_skel-@VMAJ@ 3includesdir = $(includedir)/my_app-@VMAJ@
4includes_HEADERS = \ 4includes_HEADERS = \
5 lib/Lib.h 5 lib/Lib.h
6 6
7lib_libelm_skel_la_SOURCES = \ 7lib_libmy_app_la_SOURCES = \
8 lib/lib.c 8 lib/lib.c
9 9
10EXTRA_DIST += lib/lib_private.h 10EXTRA_DIST += lib/lib_private.h
11 11
12lib_LTLIBRARIES += lib/libelm_skel.la 12lib_LTLIBRARIES += lib/libmy_app.la
13 13
14lib_libelm_skel_la_LIBADD = @EFL_LIBS@ @ELM_SKEL_COV_LIBS@ 14lib_libmy_app_la_LIBADD = @EFL_LIBS@ @MY_APP_COV_LIBS@
15lib_libelm_skel_la_CFLAGS = 15lib_libmy_app_la_CFLAGS =
16lib_libelm_skel_la_LDFLAGS = @ELM_SKEL_LDFLAGS@ @PROJECT_LTLIBRARY_FLAGS@ 16lib_libmy_app_la_LDFLAGS = @MY_APP_LDFLAGS@ @PROJECT_LTLIBRARY_FLAGS@
17 17
18### Unit tests 18### Unit tests
19 19
20if ELM_SKEL_ENABLE_TESTS 20if MY_APP_ENABLE_TESTS
21 21
22TESTS += tests/elm_skel_suite 22TESTS += tests/my_app_suite
23check_PROGRAMS += tests/elm_skel_suite 23check_PROGRAMS += tests/my_app_suite
24 24
25tests_elm_skel_suite_SOURCES = \ 25tests_my_app_suite_SOURCES = \
26 tests/elm_skel_suite.c 26 tests/my_app_suite.c
27 27
28tests_elm_skel_suite_CFLAGS = @CHECK_CFLAGS@ 28tests_my_app_suite_CFLAGS = @CHECK_CFLAGS@
29tests_elm_skel_suite_LDADD = @CHECK_LIBS@ lib/libelm_skel.la 29tests_my_app_suite_LDADD = @CHECK_LIBS@ lib/libmy_app.la
30tests_elm_skel_suite_DEPENDENCIES = 30tests_my_app_suite_DEPENDENCIES =
31 31
32endif 32endif
diff --git a/app/src/bin/app.c b/app/src/bin/app.c
index b9c55ed..f0434c9 100644
--- a/app/src/bin/app.c
+++ b/app/src/bin/app.c
@@ -33,7 +33,7 @@ app_init(App *app)
33 33
34 app_gui_notify(app, "Application initializing..."); 34 app_gui_notify(app, "Application initializing...");
35 35
36 if(!elm_skel_lib_init()) 36 if(!my_app_lib_init())
37 { 37 {
38 app_gui_error(app, "initialization miserably failed."); 38 app_gui_error(app, "initialization miserably failed.");
39 goto shutdown_none; 39 goto shutdown_none;
@@ -56,7 +56,7 @@ app_init(App *app)
56 return EINA_TRUE; 56 return EINA_TRUE;
57 57
58shutdown_skel_lib: 58shutdown_skel_lib:
59 elm_skel_lib_shutdown(); 59 my_app_lib_shutdown();
60shutdown_module0: 60shutdown_module0:
61 _module0_shutdown(app); 61 _module0_shutdown(app);
62shutdown_none: 62shutdown_none:
@@ -70,7 +70,7 @@ app_shutdown(App *app)
70 { 70 {
71 _module1_shutdown(app); 71 _module1_shutdown(app);
72 _module0_shutdown(app); 72 _module0_shutdown(app);
73 elm_skel_lib_shutdown(); 73 my_app_lib_shutdown();
74 } 74 }
75 75
76 app->init_done = EINA_FALSE; 76 app->init_done = EINA_FALSE;
diff --git a/app/src/bin/app.h b/app/src/bin/app.h
index 9983152..ce36e42 100644
--- a/app/src/bin/app.h
+++ b/app/src/bin/app.h
@@ -1,5 +1,5 @@
1#ifndef _ELM_SKEL_APP_H 1#ifndef _MY_APP_APP_H
2#define _ELM_SKEL_APP_H 2#define _MY_APP_APP_H
3 3
4#ifdef HAVE_CONFIG_H 4#ifdef HAVE_CONFIG_H
5# include <config.h> 5# include <config.h>
@@ -9,34 +9,34 @@
9 9
10#define MAX_PATH 64 10#define MAX_PATH 64
11 11
12extern int _elm_skel_log_dom; 12extern int _my_app_log_dom;
13#undef EINA_LOG_DOMAIN_DEFAULT 13#undef EINA_LOG_DOMAIN_DEFAULT
14#define EINA_LOG_DOMAIN_DEFAULT _elm_skel_log_dom 14#define EINA_LOG_DOMAIN_DEFAULT _my_app_log_dom
15 15
16#ifdef CRITICAL 16#ifdef CRITICAL
17#undef CRITICAL 17#undef CRITICAL
18#endif 18#endif
19#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_skel_log_dom, __VA_ARGS__) 19#define CRITICAL(...) EINA_LOG_DOM_CRIT(_my_app_log_dom, __VA_ARGS__)
20 20
21#ifdef ERR 21#ifdef ERR
22#undef ERR 22#undef ERR
23#endif 23#endif
24#define ERR(...) EINA_LOG_DOM_ERR(_elm_skel_log_dom, __VA_ARGS__) 24#define ERR(...) EINA_LOG_DOM_ERR(_my_app_log_dom, __VA_ARGS__)
25 25
26#ifdef WRN 26#ifdef WRN
27#undef WRN 27#undef WRN
28#endif 28#endif
29#define WRN(...) EINA_LOG_DOM_WARN(_elm_skel_log_dom, __VA_ARGS__) 29#define WRN(...) EINA_LOG_DOM_WARN(_my_app_log_dom, __VA_ARGS__)
30 30
31#ifdef INF 31#ifdef INF
32#undef INF 32#undef INF
33#endif 33#endif
34#define INF(...) EINA_LOG_DOM_INFO(_elm_skel_log_dom, __VA_ARGS__) 34#define INF(...) EINA_LOG_DOM_INFO(_my_app_log_dom, __VA_ARGS__)
35 35
36#ifdef DBG 36#ifdef DBG
37#undef DBG 37#undef DBG
38#endif 38#endif
39#define DBG(...) EINA_LOG_DOM_DBG(_elm_skel_log_dom, __VA_ARGS__) 39#define DBG(...) EINA_LOG_DOM_DBG(_my_app_log_dom, __VA_ARGS__)
40 40
41typedef enum _App_Frames 41typedef enum _App_Frames
42{ 42{
@@ -92,4 +92,4 @@ app_gui_notify(App *app, const char *msg);
92void 92void
93app_gui_error(App *app, const char *msg); 93app_gui_error(App *app, const char *msg);
94 94
95#endif /* _ELM_SKEL_APP_H */ 95#endif /* _MY_APP_APP_H */
diff --git a/app/src/bin/gui.c b/app/src/bin/gui.c
index 6a6ee92..52c16cc 100644
--- a/app/src/bin/gui.c
+++ b/app/src/bin/gui.c
@@ -275,7 +275,7 @@ app_gui_create(App *app, Eina_Bool fullscreen, Eina_Rectangle geometry)
275 if (!win) return NULL; 275 if (!win) return NULL;
276 evas_object_smart_callback_add(win, "delete,request", _on_del, NULL); 276 evas_object_smart_callback_add(win, "delete,request", _on_del, NULL);
277 elm_win_autodel_set(win, EINA_TRUE); 277 elm_win_autodel_set(win, EINA_TRUE);
278 elm_win_icon_name_set(win, "elm_skel"); 278 elm_win_icon_name_set(win, "my_app");
279 /* elm_win_focus_highlight_enabled_set(win, EINA_TRUE); */ 279 /* elm_win_focus_highlight_enabled_set(win, EINA_TRUE); */
280 evas_object_show(win); 280 evas_object_show(win);
281 281
diff --git a/app/src/bin/main.c b/app/src/bin/main.c
index b418c5f..14de93f 100644
--- a/app/src/bin/main.c
+++ b/app/src/bin/main.c
@@ -6,7 +6,7 @@
6 6
7#include "app.h" 7#include "app.h"
8 8
9int _elm_skel_log_dom = -1; 9int _my_app_log_dom = -1;
10 10
11static const Ecore_Getopt options = 11static const Ecore_Getopt options =
12{ 12{
@@ -78,7 +78,7 @@ elm_main(int argc, char *argv[])
78 elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); 78 elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
79 elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); 79 elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
80 elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); 80 elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
81 elm_app_info_set(elm_main, "elm_skel", "themes/default.edj"); 81 elm_app_info_set(elm_main, "my_app", "themes/default.edj");
82 82
83 args = ecore_getopt_parse(&options, values, argc, argv); 83 args = ecore_getopt_parse(&options, values, argc, argv);
84 84
@@ -98,10 +98,10 @@ elm_main(int argc, char *argv[])
98 if (engine) elm_config_preferred_engine_set(engine); 98 if (engine) elm_config_preferred_engine_set(engine);
99 99
100 eina_log_color_disable_set(EINA_FALSE); 100 eina_log_color_disable_set(EINA_FALSE);
101 _elm_skel_log_dom = eina_log_domain_register(PACKAGE_NAME, EINA_COLOR_CYAN); 101 _my_app_log_dom = eina_log_domain_register(PACKAGE_NAME, EINA_COLOR_CYAN);
102 102
103 EINA_LOG_DOM_INFO(_elm_skel_log_dom, "%s %s:", PACKAGE_NAME, VERSION); 103 EINA_LOG_DOM_INFO(_my_app_log_dom, "%s %s:", PACKAGE_NAME, VERSION);
104 EINA_LOG_DOM_DBG(_elm_skel_log_dom, "\n bin: %s\n lib: %s\n data: %s", 104 EINA_LOG_DOM_DBG(_my_app_log_dom, "\n bin: %s\n lib: %s\n data: %s",
105 elm_app_bin_dir_get(), 105 elm_app_bin_dir_get(),
106 elm_app_lib_dir_get(), 106 elm_app_lib_dir_get(),
107 elm_app_data_dir_get()); 107 elm_app_data_dir_get());
@@ -114,7 +114,7 @@ elm_main(int argc, char *argv[])
114 app = app_get(theme_file_path, extension_file_path); 114 app = app_get(theme_file_path, extension_file_path);
115 if (!app_gui_create(app, fullscreen, geometry)) 115 if (!app_gui_create(app, fullscreen, geometry))
116 { 116 {
117 EINA_LOG_DOM_ERR(_elm_skel_log_dom, "unable to create application window"); 117 EINA_LOG_DOM_ERR(_my_app_log_dom, "unable to create application window");
118 app_free(app); 118 app_free(app);
119 return EXIT_FAILURE; 119 return EXIT_FAILURE;
120 } 120 }
diff --git a/app/src/lib/Lib.h b/app/src/lib/Lib.h
index b86bd35..46d3352 100644
--- a/app/src/lib/Lib.h
+++ b/app/src/lib/Lib.h
@@ -1,5 +1,5 @@
1#ifndef _ELM_SKEL_LIB_H 1#ifndef _MY_APP_LIB_H
2#define _ELM_SKEL_LIB_H 2#define _MY_APP_LIB_H
3 3
4#ifdef __cplusplus 4#ifdef __cplusplus
5extern "C" { 5extern "C" {
@@ -15,10 +15,10 @@ extern "C" {
15 * This function initializes Lib and increments a counter of the number 15 * This function initializes Lib and increments a counter of the number
16 * of calls to it. The new counter value is then returned. 16 * of calls to it. The new counter value is then returned.
17 * 17 *
18 * @see elm_skel_lib_shutdown(). 18 * @see my_app_lib_shutdown().
19 */ 19 */
20EAPI int 20EAPI int
21elm_skel_lib_init(void); 21my_app_lib_init(void);
22 22
23/** 23/**
24 * Shutdown Lib 24 * Shutdown Lib
@@ -26,18 +26,18 @@ elm_skel_lib_init(void);
26 * @return The init counter value. 26 * @return The init counter value.
27 * 27 *
28 * This function finalizes Lib and decrments a counter of the number 28 * This function finalizes Lib and decrments a counter of the number
29 * of calls to elm_skel_lib_init(). The new counter value is then returned. 29 * of calls to my_app_lib_init(). The new counter value is then returned.
30 * 30 *
31 * @see elm_skel_lib_shutdown(). 31 * @see my_app_lib_shutdown().
32 */ 32 */
33EAPI int 33EAPI int
34elm_skel_lib_shutdown(void); 34my_app_lib_shutdown(void);
35 35
36EAPI const char * 36EAPI const char *
37elm_skel_lib_hello(void); 37my_app_lib_hello(void);
38 38
39#ifdef __cplusplus 39#ifdef __cplusplus
40} 40}
41#endif 41#endif
42 42
43#endif /* _ELM_SKEL_LIB_H */ 43#endif /* _MY_APP_LIB_H */
diff --git a/app/src/lib/lib.c b/app/src/lib/lib.c
index 77475c3..b6a3a71 100644
--- a/app/src/lib/lib.c
+++ b/app/src/lib/lib.c
@@ -5,25 +5,25 @@
5#include "Lib.h" 5#include "Lib.h"
6#include "lib_private.h" 6#include "lib_private.h"
7 7
8int _elm_skel_lib_log_dom = -1; 8int _my_app_lib_log_dom = -1;
9int _elm_skel_lib_init_count = 0; 9int _my_app_lib_init_count = 0;
10 10
11EAPI int 11EAPI int
12elm_skel_lib_init(void) 12my_app_lib_init(void)
13{ 13{
14 const char * log_dom = "elm_skel_lib"; 14 const char * log_dom = "my_app_lib";
15 15
16 if (++_elm_skel_lib_init_count != 1) 16 if (++_my_app_lib_init_count != 1)
17 { 17 {
18 DBG("init count is %d.", _elm_skel_lib_init_count); 18 DBG("init count is %d.", _my_app_lib_init_count);
19 return _elm_skel_lib_init_count; 19 return _my_app_lib_init_count;
20 } 20 }
21 21
22 if(!eina_init()) 22 if(!eina_init())
23 goto shutdown_eina; 23 goto shutdown_eina;
24 24
25 _elm_skel_lib_log_dom = eina_log_domain_register(log_dom, EINA_COLOR_LIGHTBLUE); 25 _my_app_lib_log_dom = eina_log_domain_register(log_dom, EINA_COLOR_LIGHTBLUE);
26 if (_elm_skel_lib_log_dom < 0) 26 if (_my_app_lib_log_dom < 0)
27 { 27 {
28 EINA_LOG_ERR("Could not register log domain: %s", log_dom); 28 EINA_LOG_ERR("Could not register log domain: %s", log_dom);
29 goto shutdown_log_dom; 29 goto shutdown_log_dom;
@@ -32,27 +32,27 @@ elm_skel_lib_init(void)
32 /* FIXME init stuff goes here */ 32 /* FIXME init stuff goes here */
33 DBG("init..."); 33 DBG("init...");
34 34
35 return _elm_skel_lib_init_count; 35 return _my_app_lib_init_count;
36 36
37shutdown_log_dom: 37shutdown_log_dom:
38 eina_shutdown(); 38 eina_shutdown();
39shutdown_eina: 39shutdown_eina:
40 return --_elm_skel_lib_init_count; 40 return --_my_app_lib_init_count;
41} 41}
42 42
43EAPI int 43EAPI int
44elm_skel_lib_shutdown(void) 44my_app_lib_shutdown(void)
45{ 45{
46 if (_elm_skel_lib_init_count <= 0) 46 if (_my_app_lib_init_count <= 0)
47 { 47 {
48 ERR("init count not greater than 0."); 48 ERR("init count not greater than 0.");
49 return 0; 49 return 0;
50 } 50 }
51 51
52 if (--_elm_skel_lib_init_count != 0) 52 if (--_my_app_lib_init_count != 0)
53 { 53 {
54 DBG("init count is %d.", _elm_skel_lib_init_count); 54 DBG("init count is %d.", _my_app_lib_init_count);
55 return _elm_skel_lib_init_count; 55 return _my_app_lib_init_count;
56 } 56 }
57 57
58 /* FIXME shutdown stuff goes here */ 58 /* FIXME shutdown stuff goes here */
@@ -60,11 +60,11 @@ elm_skel_lib_shutdown(void)
60 60
61 eina_shutdown(); 61 eina_shutdown();
62 62
63 return _elm_skel_lib_init_count; 63 return _my_app_lib_init_count;
64} 64}
65 65
66EAPI const char * 66EAPI const char *
67elm_skel_lib_hello(void) 67my_app_lib_hello(void)
68{ 68{
69 INF("called"); 69 INF("called");
70 return "Hello from the EFL world"; 70 return "Hello from the EFL world";
diff --git a/app/src/lib/lib_private.h b/app/src/lib/lib_private.h
index ec5eba6..2d7caf0 100644
--- a/app/src/lib/lib_private.h
+++ b/app/src/lib/lib_private.h
@@ -1,33 +1,33 @@
1#ifndef _ELM_SKEL_LIB_PRIVATE_H 1#ifndef _MY_APP_LIB_PRIVATE_H
2#define _ELM_SKEL_LIB_PRIVATE_H 2#define _MY_APP_LIB_PRIVATE_H
3 3
4#include <Eina.h> 4#include <Eina.h>
5 5
6extern int _elm_skel_lib_log_dom; 6extern int _my_app_lib_log_dom;
7 7
8#ifdef CRITICAL 8#ifdef CRITICAL
9#undef CRITICAL 9#undef CRITICAL
10#endif 10#endif
11#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_skel_lib_log_dom, __VA_ARGS__) 11#define CRITICAL(...) EINA_LOG_DOM_CRIT(_my_app_lib_log_dom, __VA_ARGS__)
12 12
13#ifdef ERR 13#ifdef ERR
14#undef ERR 14#undef ERR
15#endif 15#endif
16#define ERR(...) EINA_LOG_DOM_ERR(_elm_skel_lib_log_dom, __VA_ARGS__) 16#define ERR(...) EINA_LOG_DOM_ERR(_my_app_lib_log_dom, __VA_ARGS__)
17 17
18#ifdef WRN 18#ifdef WRN
19#undef WRN 19#undef WRN
20#endif 20#endif
21#define WRN(...) EINA_LOG_DOM_WARN(_elm_skel_lib_log_dom, __VA_ARGS__) 21#define WRN(...) EINA_LOG_DOM_WARN(_my_app_lib_log_dom, __VA_ARGS__)
22 22
23#ifdef INF 23#ifdef INF
24#undef INF 24#undef INF
25#endif 25#endif
26#define INF(...) EINA_LOG_DOM_INFO(_elm_skel_lib_log_dom, __VA_ARGS__) 26#define INF(...) EINA_LOG_DOM_INFO(_my_app_lib_log_dom, __VA_ARGS__)
27 27
28#ifdef DBG 28#ifdef DBG
29#undef DBG 29#undef DBG
30#endif 30#endif
31#define DBG(...) EINA_LOG_DOM_DBG(_elm_skel_lib_log_dom, __VA_ARGS__) 31#define DBG(...) EINA_LOG_DOM_DBG(_my_app_lib_log_dom, __VA_ARGS__)
32 32
33#endif /* _ELM_SKEL_LIB_PRIVATE_H */ 33#endif /* _MY_APP_LIB_PRIVATE_H */
diff --git a/app/src/tests/elm_skel_suite.c b/app/src/tests/my_app_suite.c
index e93c026..c0eb7bd 100644
--- a/app/src/tests/elm_skel_suite.c
+++ b/app/src/tests/my_app_suite.c
@@ -5,26 +5,26 @@
5#include <check.h> 5#include <check.h>
6#include "Lib.h" 6#include "Lib.h"
7 7
8START_TEST (test_elm_skel_lib) 8START_TEST (test_my_app_lib)
9{ 9{
10 ck_assert(elm_skel_lib_init() == 1); 10 ck_assert(my_app_lib_init() == 1);
11 ck_assert(elm_skel_lib_init() == 2); 11 ck_assert(my_app_lib_init() == 2);
12 12
13 ck_assert(strcmp(elm_skel_lib_hello(), "Hello from the EFL world") == 0); 13 ck_assert(strcmp(my_app_lib_hello(), "Hello from the EFL world") == 0);
14 14
15 ck_assert(elm_skel_lib_shutdown() == 1); 15 ck_assert(my_app_lib_shutdown() == 1);
16 ck_assert(elm_skel_lib_shutdown() == 0); 16 ck_assert(my_app_lib_shutdown() == 0);
17 ck_assert(elm_skel_lib_shutdown() == 0); 17 ck_assert(my_app_lib_shutdown() == 0);
18} 18}
19END_TEST 19END_TEST
20 20
21Suite * 21Suite *
22elm_skel_suite (void) 22my_app_suite (void)
23{ 23{
24 Suite *s = suite_create ("Elm_Skel"); 24 Suite *s = suite_create ("Elm_Skel");
25 25
26 TCase *tc_core = tcase_create ("Core"); 26 TCase *tc_core = tcase_create ("Core");
27 tcase_add_test (tc_core, test_elm_skel_lib); 27 tcase_add_test (tc_core, test_my_app_lib);
28 suite_add_tcase (s, tc_core); 28 suite_add_tcase (s, tc_core);
29 29
30 return s; 30 return s;
@@ -34,7 +34,7 @@ int
34main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) 34main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
35{ 35{
36 int number_failed; 36 int number_failed;
37 Suite *s = elm_skel_suite(); 37 Suite *s = my_app_suite();
38 SRunner *sr = srunner_create(s); 38 SRunner *sr = srunner_create(s);
39 srunner_run_all(sr, CK_ENV); 39 srunner_run_all(sr, CK_ENV);
40 number_failed = srunner_ntests_failed(sr); 40 number_failed = srunner_ntests_failed(sr);