autotools: fixed data installation directories.

This commit is contained in:
Daniel Juyung Seo 2013-01-05 16:29:19 +09:00
parent f69793bc24
commit 0496ceda37
10 changed files with 37 additions and 21 deletions

View File

@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
# get rid of that stupid cache mechanism
rm -f config.cache
AC_INIT([elm_theme_viewer], [0.1.0], [seojuyung2@gmail.com])
AC_INIT([elm-theme-viewer], [0.1.0], [seojuyung2@gmail.com])
AC_PREREQ([2.60])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
@ -53,6 +53,8 @@ AC_CONFIG_FILES([
Makefile
src/Makefile
data/Makefile
data/images/Makefile
data/themes/Makefile
])
AC_OUTPUT

View File

@ -1,21 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = images themes
EDJE_CC = @edje_cc@
EDJE_FLAGS_VERBOSE_ =
EDJE_FLAGS_VERBOSE_0 =
EDJE_FLAGS_VERBOSE_1 = -v
EDJE_FLAGS = $(EDJE_FLAGS_$(V))
filesdir = $(pkgdatadir)/
files_DATA = \
layout.edj
EXTRA_DIST = layout.edc
layout.edj: Makefile layout.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/layout.edc \
$(top_builddir)/data/layout.edj
clean-local:
rm -f *.edj

9
data/images/Makefile.am Normal file
View File

@ -0,0 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(pkgdatadir)/images
files_DATA = \
sky_01.jpg \
sky_02.jpg \
sky_03.jpg \
sky_04.jpg
EXTRA_DIST = $(files_DATA)

View File

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 132 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

21
data/themes/Makefile.am Normal file
View File

@ -0,0 +1,21 @@
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = @edje_cc@
EDJE_FLAGS_VERBOSE_ =
EDJE_FLAGS_VERBOSE_0 =
EDJE_FLAGS_VERBOSE_1 = -v
EDJE_FLAGS = $(EDJE_FLAGS_$(V))
filesdir = $(pkgdatadir)/themes
files_DATA = \
layout.edj
EXTRA_DIST = layout.edc
layout.edj: Makefile layout.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/layout.edc \
$(top_builddir)/data/themes/layout.edj
clean-local:
rm -f *.edj

View File

@ -262,6 +262,7 @@ void
gui_create(const char *edje_file)
{
Evas_Object *o, *preview_frame;
char path[PATH_MAX];
if (!edje_file) return;
@ -273,7 +274,8 @@ gui_create(const char *edje_file)
evas_object_show(o);
gui_layout = o = elm_layout_add(win);
elm_layout_file_set(o, "data/layout.edj", "etv/main/layout");
snprintf(path, sizeof(path), "%s/themes/layout.edj", elm_app_data_dir_get());
elm_layout_file_set(o, path, "etv/main/layout");
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, o);
evas_object_show(o);