From 1e556d275e1bc3626d5786a679fa8b3cad3649fa Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Fri, 9 Sep 2016 18:29:06 +0100 Subject: [PATCH] template: Update build and default app settings better out-of-the-box experience for a new app. --- .../skeleton/eflproject/src/bin/${edi_name}_main.c | 12 ++++++++---- data/extra/skeleton/eflproject/src/lib/Makefile.am | 4 +++- data/extra/skeleton/eflproject/src/tests/Makefile.am | 3 +++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/data/extra/skeleton/eflproject/src/bin/${edi_name}_main.c b/data/extra/skeleton/eflproject/src/bin/${edi_name}_main.c index ea98ee5..94c63eb 100644 --- a/data/extra/skeleton/eflproject/src/bin/${edi_name}_main.c +++ b/data/extra/skeleton/eflproject/src/bin/${edi_name}_main.c @@ -6,11 +6,13 @@ * Always put system first, then EFL, then your public header, * and finally your private one. */ +#if ENABLE_NLS +# include +#endif + #include #include -#include "gettext.h" - #include "${Edi_Name}.h" #include "${edi_name}_private.h" @@ -37,11 +39,13 @@ ${edi_name}_win_setup(void) label = elm_label_add(win); elm_object_text_set(label, " Hello World !"); - evas_object_size_hint_weight_set(label, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(label); elm_win_resize_object_add(win, label); + evas_object_resize(win, 300 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); diff --git a/data/extra/skeleton/eflproject/src/lib/Makefile.am b/data/extra/skeleton/eflproject/src/lib/Makefile.am index eea9995..bac49ae 100644 --- a/data/extra/skeleton/eflproject/src/lib/Makefile.am +++ b/data/extra/skeleton/eflproject/src/lib/Makefile.am @@ -13,6 +13,8 @@ lib_LTLIBRARIES = lib${edi_name}.la includes_HEADERS = ${Edi_Name}.h includesdir = $(includedir)/${edi_name}-@VMAJ@ -lib${edi_name}_la_SOURCES = ${edi_name}.c +lib${edi_name}_la_SOURCES = \ +${efl_name}_private.h \ +${edi_name}.c lib${edi_name}_la_LIBADD = @EFL_LIBS@ -lm lib${edi_name}_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@ diff --git a/data/extra/skeleton/eflproject/src/tests/Makefile.am b/data/extra/skeleton/eflproject/src/tests/Makefile.am index c051f4e..77c4de5 100644 --- a/data/extra/skeleton/eflproject/src/tests/Makefile.am +++ b/data/extra/skeleton/eflproject/src/tests/Makefile.am @@ -1,3 +1,5 @@ +MAINTAINERCLEANFILES = Makefile.in +CLEANFILES = check-results.xml if EFL_HAVE_TESTS @@ -5,6 +7,7 @@ check_PROGRAMS = ${edi_name}_tests ${edi_name}_tests_SOURCES = test_${edi_name}.c ${edi_name}_tests_CPPFLAGS = -I$(top_builddir)/src/lib/ \ +-I$(top_srcdir)/src/lib \ -DPACKAGE_TESTS_DIR=\"$(top_srcdir)/src/tests/\" \ -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/\" \ @EFL_CFLAGS@ \