summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-04-08 16:00:49 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-04-08 16:01:07 -0700
commit1c48b76da84a9c476befbd30c9abc2d0f238bd50 (patch)
tree531750051532a329f8a1f7bc3f6a2bb9db2deb85
parent785228de9f33461c84ef2affc84aa015d02d051f (diff)
elementary: restore examples build.
-rw-r--r--Makefile_Elm_Helpers.am11
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am3
-rw-r--r--src/examples/elementary/.gitignore2
-rw-r--r--src/examples/elementary/Makefile.am325
-rw-r--r--src/examples/elementary/filemvc.c2
-rw-r--r--src/examples/elementary/fileviewlist.c2
-rw-r--r--src/examples/elementary/performance/Makefile.am44
-rw-r--r--src/examples/elementary/sphere_hunter/sphere_hunter.edc14
9 files changed, 211 insertions, 193 deletions
diff --git a/Makefile_Elm_Helpers.am b/Makefile_Elm_Helpers.am
index be2b55ca33..8acaab46f8 100644
--- a/Makefile_Elm_Helpers.am
+++ b/Makefile_Elm_Helpers.am
@@ -8,3 +8,14 @@ AM_V_EPB = $(am__v_EPB_@AM_V@)
8am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@) 8am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@)
9am__v_EPB_0 = @echo " EPB " $@; 9am__v_EPB_0 = @echo " EPB " $@;
10 10
11if HAVE_ELEMENTARY_CODEGEN
12ELEMENTARY_CODEGEN = @elementary_codegen@
13else
14ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/elementary/elementary_codegen
15endif
16
17AM_V_CODEGEN = $(am__v_CODEGEN_@AM_V@)
18am__v_CODEGEN_ = $(am__v_CODEGEN_@AM_DEFAULT_V@)
19am__v_CODEGEN_0 = @echo " CODEGEN " $@;
20
21
diff --git a/configure.ac b/configure.ac
index 3ad927387f..44daa45356 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5430,6 +5430,7 @@ src/examples/ethumb_client/Makefile
5430src/examples/elua/Makefile 5430src/examples/elua/Makefile
5431src/examples/eolian_cxx/Makefile 5431src/examples/eolian_cxx/Makefile
5432src/examples/elocation/Makefile 5432src/examples/elocation/Makefile
5433src/examples/elementary/Makefile
5433src/lib/eina/eina_config.h 5434src/lib/eina/eina_config.h
5434src/lib/ecore_x/ecore_x_version.h 5435src/lib/ecore_x/ecore_x_version.h
5435src/lib/efl/Efl_Config.h 5436src/lib/efl/Efl_Config.h
diff --git a/src/Makefile.am b/src/Makefile.am
index da975e226e..3aaa2ce944 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,7 +130,8 @@ examples/edje \
130examples/emotion \ 130examples/emotion \
131examples/emile \ 131examples/emile \
132examples/elocation \ 132examples/elocation \
133examples/ethumb_client 133examples/ethumb_client \
134examples/elementary
134 135
135if HAVE_ELUA 136if HAVE_ELUA
136EXAMPLES_SUBDIRS += examples/elua 137EXAMPLES_SUBDIRS += examples/elua
diff --git a/src/examples/elementary/.gitignore b/src/examples/elementary/.gitignore
index 389c2e92ff..b2a9ac5786 100644
--- a/src/examples/elementary/.gitignore
+++ b/src/examples/elementary/.gitignore
@@ -154,3 +154,5 @@
154/table_cxx_example_01 154/table_cxx_example_01
155/table_cxx_example_02 155/table_cxx_example_02
156/thumb_cxx_example_01 156/thumb_cxx_example_01
157/benchmark3d
158/sphere-hunter \ No newline at end of file
diff --git a/src/examples/elementary/Makefile.am b/src/examples/elementary/Makefile.am
index 24f1dd2886..86e9721be6 100644
--- a/src/examples/elementary/Makefile.am
+++ b/src/examples/elementary/Makefile.am
@@ -1,8 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = sphere_hunter performance 3include ../../../Makefile_Elm_Helpers.am
4 4include ../../Makefile_Edje_Helper.am
5include ../../Makefile_Elm_Helpers.am
6 5
7.PHONY: screenshots 6.PHONY: screenshots
8 7
@@ -13,9 +12,29 @@ files_DATA =
13AM_CPPFLAGS = \ 12AM_CPPFLAGS = \
14-Wno-unused-parameter \ 13-Wno-unused-parameter \
15-I. \ 14-I. \
16-I$(top_srcdir)/src/lib \ 15-I$(top_builddir)/src/bindings \
17-I$(top_builddir)/src/lib \ 16-I$(top_srcdir)/src/bindings \
18-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \ 17-I$(top_builddir)/src/lib/efl \
18-I$(top_builddir)/src/lib/efl/interfaces \
19-I$(top_srcdir)/src/lib/eina \
20-I$(top_builddir)/src/lib/eina \
21-I$(top_srcdir)/src/bindings/eina_cxx \
22-I$(top_builddir)/src/bindings/eina_cxx \
23-I$(top_srcdir)/src/lib/eo \
24-I$(top_builddir)/src/lib/eo \
25-I$(top_srcdir)/src/bindings/eo_cxx \
26-I$(top_builddir)/src/bindings/eo_cxx \
27-I$(top_srcdir)/src/bindings/eldbus_cxx \
28-I$(top_builddir)/src/bindings/eldbus_cxx \
29-I$(top_srcdir)/src/lib/ector \
30-I$(top_builddir)/src/lib/ector \
31-I$(top_srcdir)/src/lib/evas \
32-I$(top_builddir)/src/lib/evas \
33-I$(top_srcdir)/src/lib/evas/canvas \
34-I$(top_builddir)/src/lib/evas/canvas \
35-I$(top_srcdir)/src/lib/elementary \
36-I$(top_builddir)/src/lib/elementary \
37-DPACKAGE_DATA_DIR="\"$(datadir)/elementary\"" \
19-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 38-DPACKAGE_BIN_DIR=\"$(bindir)\" \
20-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 39-DPACKAGE_LIB_DIR=\"$(libdir)\" \
21@ELEMENTARY_CFLAGS@ 40@ELEMENTARY_CFLAGS@
@@ -25,11 +44,20 @@ AM_CXXFLAGS = \
25@ELEMENTARY_CXX_CFLAGS@ 44@ELEMENTARY_CXX_CFLAGS@
26 45
27LDADD = \ 46LDADD = \
28@ELEMENTARY_LIBS@ \ 47@ELEMENTARY_LDFLAGS@ \
29$(top_builddir)/src/lib/libelementary.la 48$(top_builddir)/src/lib/eina/libeina.la \
30 49$(top_builddir)/src/lib/eo/libeo.la \
31ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ 50$(top_builddir)/src/lib/eet/libeet.la \
32ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example 51$(top_builddir)/src/lib/evas/libevas.la \
52$(top_builddir)/src/lib/ecore/libecore.la \
53$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
54$(top_builddir)/src/lib/ecore_file/libecore_file.la \
55$(top_builddir)/src/lib/ecore_input/libecore_input.la \
56$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
57$(top_builddir)/src/lib/ecore_imf_evas/libecore_imf_evas.la \
58$(top_builddir)/src/lib/embryo/libembryo.la \
59$(top_builddir)/src/lib/edje/libedje.la \
60$(top_builddir)/src/lib/elementary/libelementary.la
33 61
34SRCS = \ 62SRCS = \
35actionslider_example_01.c \ 63actionslider_example_01.c \
@@ -149,35 +177,35 @@ evas3d_map_example.c \
149track_example_01.c \ 177track_example_01.c \
150twitter_example_01.edc 178twitter_example_01.edc
151 179
152if HAVE_CXX11 180# if HAVE_CXX11
153SRCS += \ 181# SRCS += \
154thumb_cxx_example_01.cc \ 182# thumb_cxx_example_01.cc \
155table_cxx_example_02.cc \ 183# table_cxx_example_02.cc \
156table_cxx_example_01.cc \ 184# table_cxx_example_01.cc \
157spinner_cxx_example.cc \ 185# spinner_cxx_example.cc \
158slider_cxx_example.cc \ 186# slider_cxx_example.cc \
159separator_cxx_example_01.cc \ 187# separator_cxx_example_01.cc \
160radio_cxx_example_01.cc \ 188# radio_cxx_example_01.cc \
161popup_cxx_example_01.cc \ 189# popup_cxx_example_01.cc \
162menu_cxx_example_01.cc \ 190# menu_cxx_example_01.cc \
163location_cxx_example_01.cc \ 191# location_cxx_example_01.cc \
164icon_cxx_example_01.cc \ 192# icon_cxx_example_01.cc \
165hoversel_cxx_example_01.cc \ 193# hoversel_cxx_example_01.cc \
166glview_cxx_example_01.cc \ 194# glview_cxx_example_01.cc \
167datetime_cxx_example.cc \ 195# datetime_cxx_example.cc \
168clock_cxx_example.cc \ 196# clock_cxx_example.cc \
169calendar_cxx_example_05.cc \ 197# calendar_cxx_example_05.cc \
170calendar_cxx_example_04.cc \ 198# calendar_cxx_example_04.cc \
171calendar_cxx_example_03.cc \ 199# calendar_cxx_example_03.cc \
172calendar_cxx_example_02.cc \ 200# calendar_cxx_example_02.cc \
173calendar_cxx_example_01.cc \ 201# calendar_cxx_example_01.cc \
174button_cxx_example_01.cc \ 202# button_cxx_example_01.cc \
175button_cxx_example_00.cc \ 203# button_cxx_example_00.cc \
176bubble_cxx_example_01.cc \ 204# bubble_cxx_example_01.cc \
177box_cxx_example_02.cc \ 205# box_cxx_example_02.cc \
178bg_cxx_example_02.cc \ 206# bg_cxx_example_02.cc \
179bg_cxx_example_01.cc 207# bg_cxx_example_01.cc
180endif 208# endif
181 209
182.edc.edj: 210.edc.edj:
183 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@ 211 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
@@ -185,12 +213,9 @@ endif
185.epc.epb: 213.epc.epb:
186 $(AM_V_EPB)$(ELM_PREFS_CC) $< $@ 214 $(AM_V_EPB)$(ELM_PREFS_CC) $< $@
187 215
188if EFL_INSTALL_EXAMPLES
189files_DATA += $(SRCS) \ 216files_DATA += $(SRCS) \
190 dict.txt 217 dict.txt
191endif
192 218
193if EFL_BUILD_EXAMPLES
194files_DATA += \ 219files_DATA += \
195 prefs_example_01.epb \ 220 prefs_example_01.epb \
196 prefs_example_02.epb \ 221 prefs_example_02.epb \
@@ -205,9 +230,10 @@ files_DATA += \
205clean-local: 230clean-local:
206 rm -f *.edj *.epb *.cfg *.cfg.bkp 231 rm -f *.edj *.epb *.cfg *.cfg.bkp
207 232
233ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example
234
208codegen_example_generated.c codegen_example_generated.h: codegen_example.edj 235codegen_example_generated.c codegen_example_generated.h: codegen_example.edj
209 $(ELEMENTARY_CODEGEN) $(ELEMENTARY_CODEGEN_FLAGS) codegen_example.edj \ 236 $(AM_V_CODEGEN)$(ELEMENTARY_CODEGEN) $(ELEMENTARY_CODEGEN_FLAGS) codegen_example.edj elm/example/mylayout/default codegen_example_generated.c codegen_example_generated.h
210 elm/example/mylayout/default codegen_example_generated.c codegen_example_generated.h
211 237
212BUILT_SOURCES = codegen_example_generated.c codegen_example_generated.h 238BUILT_SOURCES = codegen_example_generated.c codegen_example_generated.h
213 239
@@ -325,39 +351,61 @@ win_example \
325evas3d_scene_on_button_example \ 351evas3d_scene_on_button_example \
326evas3d_object_on_button_example \ 352evas3d_object_on_button_example \
327evas3d_map_example \ 353evas3d_map_example \
328track_example_01 354track_example_01 \
329 355benchmark3d \
330if HAVE_CXX11 356sphere-hunter
331examples_PROGRAMS += \ 357
332thumb_cxx_example_01 \ 358benchmark3d_SOURCES = \
333table_cxx_example_02 \ 359 performance/performance.c \
334table_cxx_example_01 \ 360 performance/camera_light.c \
335spinner_cxx_example \ 361 performance/graphical.c
336slider_cxx_example \ 362
337separator_cxx_example_01 \ 363sphere_hunter_SOURCES = \
338radio_cxx_example_01 \ 364 sphere_hunter/evas_3d_sphere_hunter.c
339popup_cxx_example_01 \
340menu_cxx_example_01 \
341location_cxx_example_01 \
342icon_cxx_example_01 \
343hoversel_cxx_example_01 \
344glview_cxx_example_01 \
345datetime_cxx_example \
346clock_cxx_example \
347calendar_cxx_example_05 \
348calendar_cxx_example_04 \
349calendar_cxx_example_03 \
350calendar_cxx_example_02 \
351calendar_cxx_example_01 \
352button_cxx_example_01 \
353button_cxx_example_00 \
354bubble_cxx_example_01 \
355box_cxx_example_02 \
356bg_cxx_example_02 \
357bg_cxx_example_01
358endif
359 365
360if ELEMENTARY_WINDOWS_BUILD 366files_DATA += performance/layout.edj sphere_hunter/sphere_hunter.edj
367
368performance/layout.edj: performance/layout.edc
369 $(AM_V_EDJ) \
370 $(MKDIR_P) performance/; \
371 $(EDJE_CC) $(EDJE_CC_FLAGS) -id performance/ $< $@
372
373sphere_hunter/sphere_hunter.edj: sphere_hunter/sphere_hunter.edc
374 $(AM_V_EDJ) \
375 $(MKDIR_P) sphere_hunter/; \
376 $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@
377
378# if HAVE_CXX11
379# examples_PROGRAMS += \
380# thumb_cxx_example_01 \
381# table_cxx_example_02 \
382# table_cxx_example_01 \
383# spinner_cxx_example \
384# slider_cxx_example \
385# separator_cxx_example_01 \
386# radio_cxx_example_01 \
387# popup_cxx_example_01 \
388# menu_cxx_example_01 \
389# location_cxx_example_01 \
390# icon_cxx_example_01 \
391# hoversel_cxx_example_01 \
392# glview_cxx_example_01 \
393# datetime_cxx_example \
394# clock_cxx_example \
395# calendar_cxx_example_05 \
396# calendar_cxx_example_04 \
397# calendar_cxx_example_03 \
398# calendar_cxx_example_02 \
399# calendar_cxx_example_01 \
400# button_cxx_example_01 \
401# button_cxx_example_00 \
402# bubble_cxx_example_01 \
403# box_cxx_example_02 \
404# bg_cxx_example_02 \
405# bg_cxx_example_01
406# endif
407
408if HAVE_WINDOWS
361efl_thread_1_SOURCES = efl_thread_win32_1.c 409efl_thread_1_SOURCES = efl_thread_win32_1.c
362efl_thread_2_SOURCES = efl_thread_win32_2.c 410efl_thread_2_SOURCES = efl_thread_win32_2.c
363efl_thread_3_SOURCES = efl_thread_win32_3.c 411efl_thread_3_SOURCES = efl_thread_win32_3.c
@@ -369,34 +417,34 @@ efl_thread_3_SOURCES = efl_thread_3.c
369efl_thread_4_SOURCES = efl_thread_4.c 417efl_thread_4_SOURCES = efl_thread_4.c
370endif 418endif
371 419
372if HAVE_CXX11 420# if HAVE_CXX11
373thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc 421# thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc
374table_cxx_example_02_SOURCES = table_cxx_example_02.cc 422# table_cxx_example_02_SOURCES = table_cxx_example_02.cc
375table_cxx_example_01_SOURCES = table_cxx_example_01.cc 423# table_cxx_example_01_SOURCES = table_cxx_example_01.cc
376spinner_cxx_example_SOURCES = spinner_cxx_example.cc 424# spinner_cxx_example_SOURCES = spinner_cxx_example.cc
377slider_cxx_example_SOURCES = slider_cxx_example.cc 425# slider_cxx_example_SOURCES = slider_cxx_example.cc
378separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc 426# separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc
379radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc 427# radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc
380popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc 428# popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc
381menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc 429# menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc
382location_cxx_example_01_SOURCES = location_cxx_example_01.cc 430# location_cxx_example_01_SOURCES = location_cxx_example_01.cc
383icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc 431# icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc
384hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc 432# hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc
385glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc 433# glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc
386datetime_cxx_example_SOURCES = datetime_cxx_example.cc 434# datetime_cxx_example_SOURCES = datetime_cxx_example.cc
387clock_cxx_example_SOURCES = clock_cxx_example.cc 435# clock_cxx_example_SOURCES = clock_cxx_example.cc
388calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc 436# calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc
389calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc 437# calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc
390calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc 438# calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc
391calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc 439# calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc
392calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc 440# calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc
393button_cxx_example_01_SOURCES = button_cxx_example_01.cc 441# button_cxx_example_01_SOURCES = button_cxx_example_01.cc
394button_cxx_example_00_SOURCES = button_cxx_example_00.cc 442# button_cxx_example_00_SOURCES = button_cxx_example_00.cc
395bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc 443# bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc
396box_cxx_example_02_SOURCES = box_cxx_example_02.cc 444# box_cxx_example_02_SOURCES = box_cxx_example_02.cc
397bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc 445# bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc
398bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc 446# bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc
399endif 447# endif
400 448
401# This variable will hold the list of screenshots that will be made 449# This variable will hold the list of screenshots that will be made
402# by "make screenshots". Each item in the list is of the form: 450# by "make screenshots". Each item in the list is of the form:
@@ -484,37 +532,37 @@ table_example_01:table_example_01.png:0.0 \
484table_example_02:table_example_02.png:0.0 \ 532table_example_02:table_example_02.png:0.0 \
485menu_example_01:menu_example_01.png:0.5 533menu_example_01:menu_example_01.png:0.5
486 534
487if HAVE_CXX11 535# if HAVE_CXX11
488SCREENSHOTS += \ 536# SCREENSHOTS += \
489bg_cxx_example_02:bg_cxx_example_02.png:0.0 \ 537# bg_cxx_example_02:bg_cxx_example_02.png:0.0 \
490box_cxx_example_02:box_cxx_example_02.png:1.3 \ 538# box_cxx_example_02:box_cxx_example_02.png:1.3 \
491bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \ 539# bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \
492button_cxx_example_00:button_cxx_example_00.png:0.0 \ 540# button_cxx_example_00:button_cxx_example_00.png:0.0 \
493button_cxx_example_01:button_cxx_example_01.png:0.0 \ 541# button_cxx_example_01:button_cxx_example_01.png:0.0 \
494calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \ 542# calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \
495calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \ 543# calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \
496calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \ 544# calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \
497calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \ 545# calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \
498calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \ 546# calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \
499clock_cxx_example:clock_cxx_example.png:0.5 \ 547# clock_cxx_example:clock_cxx_example.png:0.5 \
500datetime_cxx_example:datetime_cxx_example.png:0.0 \ 548# datetime_cxx_example:datetime_cxx_example.png:0.0 \
501hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \ 549# hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \
502icon_cxx_example_01:icon_cxx_example_01.png:0.0 \ 550# icon_cxx_example_01:icon_cxx_example_01.png:0.0 \
503menu_cxx_example_01:menu_cxx_example_01.png:0.5 \ 551# menu_cxx_example_01:menu_cxx_example_01.png:0.5 \
504popup_cxx_example_01:popup_cxx_example_01.png:1.0 \ 552# popup_cxx_example_01:popup_cxx_example_01.png:1.0 \
505popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \ 553# popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \
506radio_cxx_example_01:radio_cxx_example_01.png:0.0 \ 554# radio_cxx_example_01:radio_cxx_example_01.png:0.0 \
507separator_cxx_example_01:separator_cxx_example_01.png:0.0 \ 555# separator_cxx_example_01:separator_cxx_example_01.png:0.0 \
508slider_cxx_example:slider_cxx_example.png:0.0 \ 556# slider_cxx_example:slider_cxx_example.png:0.0 \
509spinner_cxx_example:spinner_cxx_example.png:0.0 \ 557# spinner_cxx_example:spinner_cxx_example.png:0.0 \
510table_cxx_example_01:table_cxx_example_01.png:0.0 \ 558# table_cxx_example_01:table_cxx_example_01.png:0.0 \
511table_cxx_example_02:table_cxx_example_02.png:0.0 \ 559# table_cxx_example_02:table_cxx_example_02.png:0.0 \
512thumb_cxx_example_01:thumb_cxx_example_01.png:0.5 560# thumb_cxx_example_01:thumb_cxx_example_01.png:0.5
513endif 561# endif
514 562
515HTML_SS_DIR=$(top_builddir)/doc/html/screenshots 563HTML_SS_DIR=$(top_builddir)/doc/html/screenshots
516LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots 564LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots
517screenshots: all 565screenshots: examples
518 @mkdir -p $(HTML_SS_DIR) 566 @mkdir -p $(HTML_SS_DIR)
519 @mkdir -p $(LATEX_SS_DIR) 567 @mkdir -p $(LATEX_SS_DIR)
520 @for ss in $(SCREENSHOTS); do \ 568 @for ss in $(SCREENSHOTS); do \
@@ -526,11 +574,10 @@ screenshots: all
526 convert $(HTML_SS_DIR)/$${SS_FILE} $(LATEX_SS_DIR)/$${SS_FILE/.png/.eps} ; \ 574 convert $(HTML_SS_DIR)/$${SS_FILE} $(LATEX_SS_DIR)/$${SS_FILE/.png/.eps} ; \
527 done 575 done
528 576
529else 577EXTRA_DIST = dict.txt layout_example.edc theme_example.edc codegen_example.edc evas3d_map_example.edc twitter_example_01.edc performance/layout.edc performance/background.png performance/target_texture.png sphere_hunter/sphere_hunter.edc sphere_hunter/score.jpg sphere_hunter/EFL_victory.png sphere_hunter/EFL_defeat.png
530
531screenshots:
532 @echo "Examples are not built. Run \"./configure --enable-build-examples\" first."
533 578
534endif 579examples: $(examples_PROGRAMS)
535 580
536EXTRA_DIST = dict.txt layout_example.edc theme_example.edc codegen_example.edc evas3d_map_example.edc twitter_example_01.edc 581install-examples:
582 $(MKDIR_P) $(datadir)/elementary/examples
583 cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(datadir)/elementary/examples
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index f681e7c9ba..2463e93bb3 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -1,7 +1,7 @@
1// gcc -o filemvc filemvc.c `pkg-config --cflags --libs elementary` 1// gcc -o filemvc filemvc.c `pkg-config --cflags --libs elementary`
2 2
3#ifdef HAVE_CONFIG_H 3#ifdef HAVE_CONFIG_H
4# include "../../elementary_config.h" 4# include "config.h"
5#else 5#else
6# define EFL_BETA_API_SUPPORT 1 6# define EFL_BETA_API_SUPPORT 1
7# define EFL_EO_API_SUPPORT 1 7# define EFL_EO_API_SUPPORT 1
diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index 4572e9d5d6..2d765acb8a 100644
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -2,7 +2,7 @@
2// gcc -o fileviewlist fileviewlist.c `pkg-config --cflags --libs elementary` 2// gcc -o fileviewlist fileviewlist.c `pkg-config --cflags --libs elementary`
3 3
4#ifdef HAVE_CONFIG_H 4#ifdef HAVE_CONFIG_H
5# include "../../elementary_config.h" 5# include "config.h"
6#else 6#else
7# define EFL_BETA_API_SUPPORT 1 7# define EFL_BETA_API_SUPPORT 1
8# define EFL_EO_API_SUPPORT 1 8# define EFL_EO_API_SUPPORT 1
diff --git a/src/examples/elementary/performance/Makefile.am b/src/examples/elementary/performance/Makefile.am
deleted file mode 100644
index 8b4124f842..0000000000
--- a/src/examples/elementary/performance/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3include ../../../Makefile_Elm_Helpers.am
4
5examplesdir = $(pkgdatadir)/examples/performance
6filesdir = $(pkgdatadir)/examples/performance
7files_DATA =
8
9AM_CPPFLAGS = \
10-Wno-unused-parameter \
11-I. \
12-I$(top_srcdir)/src/lib \
13-I$(top_builddir)/src/lib \
14-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \
15-DPACKAGE_BIN_DIR=\"$(bindir)\" \
16-DPACKAGE_LIB_DIR=\"$(libdir)\" \
17@ELEMENTARY_CFLAGS@
18
19LDADD = \
20@ELEMENTARY_LIBS@ \
21$(top_builddir)/src/lib/libelementary.la
22
23SRCS = performance.c camera_light.c graphical.c
24
25.edc.edj:
26 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
27
28if EFL_BUILD_EXAMPLES
29files_DATA += $(SRCS) layout.edc layout.edj
30
31performance_SOURCES = \
32 performance.c \
33 camera_light.c \
34 graphical.c
35
36clean-local:
37 rm -f *.edj
38
39examples_PROGRAMS = \
40 performance
41
42endif
43
44EXTRA_DIST = layout.edc background.png target_texture.png
diff --git a/src/examples/elementary/sphere_hunter/sphere_hunter.edc b/src/examples/elementary/sphere_hunter/sphere_hunter.edc
index 6dbf0e15db..b0e20b4d22 100644
--- a/src/examples/elementary/sphere_hunter/sphere_hunter.edc
+++ b/src/examples/elementary/sphere_hunter/sphere_hunter.edc
@@ -4,11 +4,11 @@ collections {
4 min: 704 800; 4 min: 704 800;
5 images { 5 images {
6 image: "score.jpg" COMP; 6 image: "score.jpg" COMP;
7 image: "../../../data/themes/img/bg_glow_in.png" COMP; 7 image: "img/bg_glow_in.png" COMP;
8 image: "../../../data/themes/img/vgrad_med.png" COMP; 8 image: "img/vgrad_med.png" COMP;
9 image: "EFL_victory.png" COMP; 9 image: "EFL_victory.png" COMP;
10 image: "EFL_defeat.png" COMP; 10 image: "EFL_defeat.png" COMP;
11 image: "../../../data/themes/img/screen_circular_shadow.png" COMP; 11 image: "img/screen_circular_shadow.png" COMP;
12 } 12 }
13 parts { 13 parts {
14 part { 14 part {
@@ -115,7 +115,7 @@ collections {
115 align: 0.5 0.0; 115 align: 0.5 0.0;
116 min: 150 75; 116 min: 150 75;
117 max: 150 75; 117 max: 150 75;
118 image.normal: "../../../data/themes/img/bg_glow_in.png"; 118 image.normal: "img/bg_glow_in.png";
119 rel1.to: "score_bg"; 119 rel1.to: "score_bg";
120 rel2.to: "score_bg"; 120 rel2.to: "score_bg";
121 } 121 }
@@ -151,7 +151,7 @@ collections {
151 state: "default" 0.0; 151 state: "default" 0.0;
152 min: 150 125; 152 min: 150 125;
153 max: 150 125; 153 max: 150 125;
154 image.normal: "../../../data/themes/img/bg_glow_in.png"; 154 image.normal: "img/bg_glow_in.png";
155 rel1.to: "score"; 155 rel1.to: "score";
156 rel2.to: "score"; 156 rel2.to: "score";
157 } 157 }
@@ -164,7 +164,7 @@ collections {
164 min: 150 5; 164 min: 150 5;
165 max: 150 5; 165 max: 150 5;
166 align: 1.0 1.0; 166 align: 1.0 1.0;
167 image.normal: "../../../data/themes/img/vgrad_med.png"; 167 image.normal: "img/vgrad_med.png";
168 rel1.to: "score_img"; 168 rel1.to: "score_img";
169 rel2.to: "score_img"; 169 rel2.to: "score_img";
170 } 170 }
@@ -177,7 +177,7 @@ collections {
177 min: 700 700; 177 min: 700 700;
178 max: 700 700; 178 max: 700 700;
179 visible: 0; 179 visible: 0;
180 image.normal: "../../../data/themes/img/screen_circular_shadow.png"; 180 image.normal: "img/screen_circular_shadow.png";
181 rel1.to: "scene_bg"; 181 rel1.to: "scene_bg";
182 rel2.to: "scene_bg"; 182 rel2.to: "scene_bg";
183 } 183 }