summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 20:55:12 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 20:55:12 +0000
commit2b29626d8d5aa47119759d0ef1d0876674f06254 (patch)
tree13622da45e0f86f8fde5bc8d50e953e958495691 /src
parent7abf31c88264c2a7692ce61c7985bc49e979163e (diff)
efl: fix make dist.
Carefully compared 'svn export' and 'make dist' results and couple of files were missing. Changes: * Makefile.am: removed all .pc from EXTRA_DIST, we shouldn't distribute them here as they will contain ./configure data such as install location. * src/Makefile.am: moved all if-endif to files, otherwise EXTRA_DIST won't work properly. We must EXTRA_DIST outside of the if-endif block. * static_libs/liblinebreak: removed couple of unused files. SVN revision: 82241
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am30
-rw-r--r--src/Makefile_EPhysics.am2
-rw-r--r--src/Makefile_Ecore.am5
-rw-r--r--src/Makefile_Ecore_Audio.am3
-rw-r--r--src/Makefile_Ecore_Cocoa.am2
-rw-r--r--src/Makefile_Ecore_FB.am5
-rw-r--r--src/Makefile_Ecore_Psl1ght.am9
-rw-r--r--src/Makefile_Ecore_SDL.am2
-rw-r--r--src/Makefile_Ecore_Wayland.am2
-rw-r--r--src/Makefile_Ecore_Win32.am2
-rw-r--r--src/Makefile_Ecore_WinCE.am2
-rw-r--r--src/Makefile_Ecore_X.am2
-rw-r--r--src/Makefile_Edje.am6
-rw-r--r--src/Makefile_Eeze.am2
-rw-r--r--src/Makefile_Efreet.am15
-rw-r--r--src/Makefile_Eina.am4
-rw-r--r--src/Makefile_Embryo.am1
-rw-r--r--src/Makefile_Escape.am3
-rw-r--r--src/Makefile_Evas.am13
-rw-r--r--src/Makefile_Evil.am11
-rw-r--r--src/examples/ecore/Makefile.am110
-rw-r--r--src/examples/edje/Makefile.am19
-rw-r--r--src/examples/ephysics/Makefile.am4
-rw-r--r--src/examples/evas/Makefile.am139
-rw-r--r--src/static_libs/liblinebreak/LineBreak1.sed1
-rw-r--r--src/static_libs/liblinebreak/LineBreak2.sed2
-rw-r--r--src/static_libs/liblinebreak/filter_dup.c48
-rwxr-xr-xsrc/static_libs/liblinebreak/gen_linebreak_data.sh11
-rwxr-xr-xsrc/static_libs/liblinebreak/gen_wordbreak_data.sh25
-rw-r--r--src/static_libs/liblinebreak/linebreakdata1.tmpl1
-rw-r--r--src/static_libs/liblinebreak/linebreakdata2.tmpl7
-rw-r--r--src/static_libs/liblinebreak/linebreakdata3.tmpl2
-rwxr-xr-xsrc/static_libs/liblinebreak/sort_numeric_hex.py6
33 files changed, 252 insertions, 244 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 20656081fc..9dec122014 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,17 +7,13 @@ SUBDIRS = . benchmarks examples
7 7
8lib_LTLIBRARIES = 8lib_LTLIBRARIES =
9bin_PROGRAMS = 9bin_PROGRAMS =
10bin_SCRIPTS =
10noinst_PROGRAMS = 11noinst_PROGRAMS =
11check_PROGRAMS = 12check_PROGRAMS =
12EXTRA_DIST = 13EXTRA_DIST =
13 14
14if HAVE_WINDOWS
15include Makefile_Evil.am 15include Makefile_Evil.am
16endif
17
18if HAVE_PS3
19include Makefile_Escape.am 16include Makefile_Escape.am
20endif
21 17
22include Makefile_Eina.am 18include Makefile_Eina.am
23include Makefile_Eo.am 19include Makefile_Eo.am
@@ -28,45 +24,23 @@ include Makefile_Ecore_Con.am
28include Makefile_Ecore_Ipc.am 24include Makefile_Ecore_Ipc.am
29include Makefile_Ecore_File.am 25include Makefile_Ecore_File.am
30include Makefile_Ecore_Input.am 26include Makefile_Ecore_Input.am
31if HAVE_ECORE_COCOA
32include Makefile_Ecore_Cocoa.am 27include Makefile_Ecore_Cocoa.am
33endif
34if HAVE_ECORE_FB
35include Makefile_Ecore_FB.am 28include Makefile_Ecore_FB.am
36endif
37if HAVE_PS3
38include Makefile_Ecore_Psl1ght.am 29include Makefile_Ecore_Psl1ght.am
39endif
40if HAVE_ECORE_SDL
41include Makefile_Ecore_SDL.am 30include Makefile_Ecore_SDL.am
42endif
43if HAVE_ECORE_WAYLAND
44include Makefile_Ecore_Wayland.am 31include Makefile_Ecore_Wayland.am
45endif
46if HAVE_WIN32
47include Makefile_Ecore_Win32.am 32include Makefile_Ecore_Win32.am
48endif
49if HAVE_WINCE
50include Makefile_Ecore_WinCE.am 33include Makefile_Ecore_WinCE.am
51endif
52if HAVE_ECORE_X
53include Makefile_Ecore_X.am 34include Makefile_Ecore_X.am
54endif
55include Makefile_Ecore_Imf.am 35include Makefile_Ecore_Imf.am
56include Makefile_Ecore_Evas.am 36include Makefile_Ecore_Evas.am
57if HAVE_ECORE_AUDIO
58include Makefile_Ecore_Audio.am 37include Makefile_Ecore_Audio.am
59endif
60include Makefile_Embryo.am 38include Makefile_Embryo.am
61include Makefile_Eio.am 39include Makefile_Eio.am
62include Makefile_EDBus.am 40include Makefile_EDBus.am
63include Makefile_Efreet.am 41include Makefile_Efreet.am
64if HAVE_EEZE
65include Makefile_Eeze.am 42include Makefile_Eeze.am
66endif
67if HAVE_EPHYSICS
68include Makefile_EPhysics.am 43include Makefile_EPhysics.am
69endif
70include Makefile_Edje.am 44include Makefile_Edje.am
71 45
72.PHONY: benchmark examples 46.PHONY: benchmark examples
@@ -75,7 +49,7 @@ benchmark:
75 @$(MAKE) $(AM_MAKEFLAGS) 49 @$(MAKE) $(AM_MAKEFLAGS)
76 @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark 50 @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark
77 51
78examples: 52examples: $(lib_LTLIBRARIES) $(bin_PROGRAMS)
79 @make 53 @make
80 @$(MAKE) $(AM_MAKEFLAGS) -C examples examples 54 @$(MAKE) $(AM_MAKEFLAGS) -C examples examples
81 55
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
index f191bc4e2b..b30d9092ca 100644
--- a/src/Makefile_EPhysics.am
+++ b/src/Makefile_EPhysics.am
@@ -1,3 +1,4 @@
1if HAVE_EPHYSICS
1 2
2### Library 3### Library
3 4
@@ -47,3 +48,4 @@ lib/evas/libevas.la \
47 48
48lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 49lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
49 50
51endif
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index ebf4cb479f..1d3a6a72cd 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -35,6 +35,7 @@ else
35if HAVE_WINCE 35if HAVE_WINCE
36lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_wince.c 36lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_wince.c
37else 37else
38EXTRA_DIST += lib/ecore/ecore_exe_ps3.c
38#if ECORE_HAVE_PS3 39#if ECORE_HAVE_PS3
39#libecore_la_SOURCES += ecore_exe_ps3.c 40#libecore_la_SOURCES += ecore_exe_ps3.c
40#else 41#else
@@ -112,3 +113,7 @@ tests_ecore_ecore_suite_LDADD += lib/ecore_audio/libecore_audio.la
112endif 113endif
113 114
114endif 115endif
116
117EXTRA_DIST += \
118tests/ecore/modem.wav \
119tests/ecore/sms.ogg
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index dc6140ee92..d2a19a11ac 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -1,3 +1,4 @@
1if HAVE_ECORE_AUDIO
1 2
2### Library 3### Library
3 4
@@ -35,3 +36,5 @@ lib/eina/libeina.la \
35@EFL_COV_LIBS@ 36@EFL_COV_LIBS@
36 37
37lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 38lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
39
40endif
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index d47a8aa8d5..b7fe49a185 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -1,3 +1,4 @@
1if HAVE_ECORE_COCOA
1 2
2### Library 3### Library
3 4
@@ -31,3 +32,4 @@ lib/eina/libeina.la \
31@ECORE_COCOA_LIBS@ 32@ECORE_COCOA_LIBS@
32 33
33lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 34lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
35endif
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index f7e9629d87..4c84b2e96f 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -1,3 +1,4 @@
1if HAVE_ECORE_FB
1 2
2### Library 3### Library
3 4
@@ -14,9 +15,6 @@ lib/ecore_fb/ecore_fb_ts.c \
14lib/ecore_fb/ecore_fb_vt.c \ 15lib/ecore_fb/ecore_fb_vt.c \
15lib/ecore_fb/ecore_fb_keytable.h \ 16lib/ecore_fb/ecore_fb_keytable.h \
16lib/ecore_fb/ecore_fb_private.h 17lib/ecore_fb/ecore_fb_private.h
17# deprecated sources (might not compile):
18# lib/ecore_fb/ecore_fb_kbd.c
19# lib/ecore_fb/ecore_fb_ps2.c
20 18
21lib_ecore_fb_libecore_fb_la_CPPFLAGS = \ 19lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/eina \ 20-I$(top_srcdir)/src/lib/eina \
@@ -36,3 +34,4 @@ lib/eina/libeina.la \
36@ECORE_FB_LIBS@ 34@ECORE_FB_LIBS@
37 35
38lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 36lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
37endif
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index e22bfa42b3..3364a1e18b 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -1,3 +1,4 @@
1if HAVE_PS3
1 2
2### Library 3### Library
3 4
@@ -10,7 +11,9 @@ lib/ecore_psl1ght/Ecore_Psl1ght.h
10lib_ecore_psl1ght_libecore_psl1ght_la_SOURCES = \ 11lib_ecore_psl1ght_libecore_psl1ght_la_SOURCES = \
11lib/ecore_psl1ght/ecore_psl1ght.c \ 12lib/ecore_psl1ght/ecore_psl1ght.c \
12lib/ecore_psl1ght/moveutil.c \ 13lib/ecore_psl1ght/moveutil.c \
14lib/ecore_psl1ght/moveutil.h \
13lib/ecore_psl1ght/spursutil.c \ 15lib/ecore_psl1ght/spursutil.c \
16lib/ecore_psl1ght/spursutil.h \
14lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \ 17lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
15lib/ecore_psl1ght/ecore_psl1ght_private.h 18lib/ecore_psl1ght/ecore_psl1ght_private.h
16 19
@@ -32,3 +35,9 @@ lib/eo/libeo.la \
32lib/eina/libeina.la 35lib/eina/libeina.la
33 36
34lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 37lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
38endif
39
40# TODO: what are they used for?
41EXTRA_DIST += \
42lib/ecore_psl1ght/gemutil.c \
43lib/ecore_psl1ght/gemutil.h
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index 1970ea6d10..deaacbe077 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -1,3 +1,4 @@
1if HAVE_ECORE_SDL
1 2
2### Library 3### Library
3 4
@@ -31,3 +32,4 @@ lib/eina/libeina.la \
31@ECORE_SDL_LIBS@ 32@ECORE_SDL_LIBS@
32 33
33lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 34lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
35endif
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 46e2d8bc5f..9afeda230d 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -1,3 +1,4 @@
1if HAVE_ECORE_WAYLAND
1 2
2### Library 3### Library
3 4
@@ -33,3 +34,4 @@ lib/eina/libeina.la \
33@ECORE_WAYLAND_LIBS@ 34@ECORE_WAYLAND_LIBS@
34 35
35lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 36lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
37endif
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index a379ba6c61..c6fbdf6161 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -1,3 +1,4 @@
1if HAVE_WIN32
1 2
2### Library 3### Library
3 4
@@ -44,3 +45,4 @@ lib/evil/libevil.la \
44@ECORE_WIN32_LIBS@ 45@ECORE_WIN32_LIBS@
45 46
46lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 47lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
48endif
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 849273d8d6..40adb9c1e1 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -1,3 +1,4 @@
1if HAVE_WINCE
1 2
2### Library 3### Library
3 4
@@ -34,3 +35,4 @@ lib/evil/libevil.la \
34@ECORE_WINCE_LIBS@ 35@ECORE_WINCE_LIBS@
35 36
36lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 37lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
38endif
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 4628f1774e..502f98171b 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -1,3 +1,4 @@
1if HAVE_ECORE_X
1 2
2### Library 3### Library
3 4
@@ -141,5 +142,6 @@ noinst_PROGRAMS += utils/ecore/makekeys
141 142
142utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c 143utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
143 144
145endif
144EXTRA_DIST += utils/ecore/mkks.sh 146EXTRA_DIST += utils/ecore/mkks.sh
145 147
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 952554d68f..f653c0f595 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -231,7 +231,11 @@ $(CWARNFLAGS) \
231EXTRA_DIST += \ 231EXTRA_DIST += \
232bin/edje/edje_convert.h \ 232bin/edje/edje_convert.h \
233bin/edje/edje_convert.c \ 233bin/edje/edje_convert.c \
234bin/edje/edje_data_convert.c 234bin/edje/edje_data_convert.c \
235bin/edje/edje_convert_main.c \
236lib/edje/edje_convert.c
237
238bin_SCRIPTS += bin/edje/edje_recc
235 239
236### Unit tests 240### Unit tests
237 241
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index c1e36b3e85..b2314546e1 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -1,3 +1,4 @@
1if HAVE_EEZE
1 2
2### Library 3### Library
3 4
@@ -166,3 +167,4 @@ $(EEZE_COMMON_CPPFLAGS) \
166tests_eeze_eeze_suite_LDADD = $(EEZE_COMMON_USER_LDADD) @CHECK_LIBS@ 167tests_eeze_eeze_suite_LDADD = $(EEZE_COMMON_USER_LDADD) @CHECK_LIBS@
167 168
168endif 169endif
170endif
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index ace11196cc..426c64f99f 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -231,3 +231,18 @@ tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
231tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@ 231tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@
232 232
233endif 233endif
234
235EXTRA_DIST += \
236tests/efreet/data/entry \
237tests/efreet/data/entry.png \
238tests/efreet/data/long.ini \
239tests/efreet/data/preferences.menu \
240tests/efreet/data/sub/Makefile.am \
241tests/efreet/data/sub/test.desktop \
242tests/efreet/data/test.desktop \
243tests/efreet/data/test_garbage \
244tests/efreet/data/test.ini \
245tests/efreet/data/test.menu \
246tests/efreet/data/test_menu_bad_comment.menu \
247tests/efreet/data/test_menu_slash_bad.menu \
248tests/efreet/data/test_type.desktop
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index b2e42ec6cf..9586e2bf6d 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -228,7 +228,7 @@ lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
228 228
229### Script 229### Script
230 230
231bin_SCRIPTS = scripts/eina/eina-bench-cmp 231bin_SCRIPTS += scripts/eina/eina-bench-cmp
232 232
233### Unit tests 233### Unit tests
234 234
@@ -325,7 +325,7 @@ tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
325endif 325endif
326 326
327EXTRA_DIST += \ 327EXTRA_DIST += \
328lib/eina/eina_config.h.in \
329lib/eina/eina_strbuf_template_c.x \ 328lib/eina/eina_strbuf_template_c.x \
330lib/eina/eina_binbuf_template_c.x \ 329lib/eina/eina_binbuf_template_c.x \
330tests/eina/sample.gpx \
331$(bin_SCRIPTS) 331$(bin_SCRIPTS)
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 77c0123cc3..ab224d50d6 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -39,6 +39,7 @@ bin_PROGRAMS += bin/embryo/embryo_cc
39 39
40bin_embryo_embryo_cc_SOURCES = \ 40bin_embryo_embryo_cc_SOURCES = \
41bin/embryo/embryo_cc_amx.h \ 41bin/embryo/embryo_cc_amx.h \
42bin/embryo/embryo_cc_osdefs.h \
42bin/embryo/embryo_cc_sc.h \ 43bin/embryo/embryo_cc_sc.h \
43bin/embryo/embryo_cc_sc1.c \ 44bin/embryo/embryo_cc_sc1.c \
44bin/embryo/embryo_cc_sc2.c \ 45bin/embryo/embryo_cc_sc2.c \
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index 2b0db2ae37..e3934a2ab8 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -1,3 +1,4 @@
1if HAVE_PS3
1 2
2### Library 3### Library
3 4
@@ -22,3 +23,5 @@ lib_escape_libescape_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/escape 23-I$(top_srcdir)/src/lib/escape
23lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ 24lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
24lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 25lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
26
27endif
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 0177efb4d4..c400164e72 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -239,12 +239,11 @@ lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
239# Linebreak 239# Linebreak
240 240
241EXTRA_DIST += \ 241EXTRA_DIST += \
242static_libs/liblinebreak/LineBreak1.sed \ 242static_libs/liblinebreak/LICENCE \
243static_libs/liblinebreak/LineBreak2.sed \ 243static_libs/liblinebreak/AUTHORS \
244static_libs/liblinebreak/linebreakdata1.tmpl \ 244static_libs/liblinebreak/NEWS \
245static_libs/liblinebreak/linebreakdata2.tmpl \ 245static_libs/liblinebreak/README \
246static_libs/liblinebreak/linebreakdata3.tmpl \ 246static_libs/liblinebreak/ChangeLog
247static_libs/liblinebreak/LICENCE
248 247
249# Engines 248# Engines
250 249
@@ -510,7 +509,9 @@ modules/evas/engines/gl_common/shader/img_bgra_vert.shd \
510modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd \ 509modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd \
511modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd \ 510modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd \
512modules/evas/engines/gl_common/shader/img_mask_frag.h \ 511modules/evas/engines/gl_common/shader/img_mask_frag.h \
512modules/evas/engines/gl_common/shader/img_mask_frag.shd \
513modules/evas/engines/gl_common/shader/img_mask_vert.h \ 513modules/evas/engines/gl_common/shader/img_mask_vert.h \
514modules/evas/engines/gl_common/shader/img_mask_vert.shd \
514modules/evas/engines/gl_common/shader/yuv_frag.shd \ 515modules/evas/engines/gl_common/shader/yuv_frag.shd \
515modules/evas/engines/gl_common/shader/yuv_vert.shd \ 516modules/evas/engines/gl_common/shader/yuv_vert.shd \
516modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd \ 517modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd \
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index b0ed2a8dfd..6f7184ffc7 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -1,4 +1,5 @@
1 1
2if HAVE_WINDOWS
2### Library 3### Library
3 4
4lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la 5lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la
@@ -119,8 +120,6 @@ lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
119lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@ 120lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
120lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 121lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
121 122
122EXTRA_DIST += lib/evil/gdtoa/README lib/evil/gdtoa/README.mingw
123
124### Binary 123### Binary
125 124
126bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil 125bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil
@@ -152,7 +151,7 @@ bin/evil/evil_test_util.h
152if HAVE_WINCE 151if HAVE_WINCE
153bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S 152bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
154#else 153#else
155#suite_SOURCES += bin/evil/memcpy_glibc_i686.S 154#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
156endif 155endif
157 156
158bin_evil_evil_suite_CPPFLAGS = \ 157bin_evil_evil_suite_CPPFLAGS = \
@@ -171,3 +170,9 @@ bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
171bin_evil_test_evil_LDADD = \ 170bin_evil_test_evil_LDADD = \
172lib/evil/libevil.la \ 171lib/evil/libevil.la \
173@EVIL_LDFLAGS@ 172@EVIL_LDFLAGS@
173
174endif
175EXTRA_DIST += \
176lib/evil/gdtoa/README \
177lib/evil/gdtoa/README.mingw \
178bin/evil/memcpy_glibc_i686.S
diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am
index 2ca56da8e6..45c6e4dba7 100644
--- a/src/examples/ecore/Makefile.am
+++ b/src/examples/ecore/Makefile.am
@@ -23,8 +23,10 @@ AM_CPPFLAGS = \
23EXTRA_PROGRAMS = \ 23EXTRA_PROGRAMS = \
24ecore_animator_example \ 24ecore_animator_example \
25ecore_client_bench \ 25ecore_client_bench \
26ecore_con_client_example \
26ecore_con_client_simple_example \ 27ecore_con_client_simple_example \
27ecore_con_lookup_example \ 28ecore_con_lookup_example \
29ecore_con_server_example \
28ecore_con_server_http_example \ 30ecore_con_server_http_example \
29ecore_con_server_simple_example \ 31ecore_con_server_simple_example \
30ecore_con_url_cookies_example \ 32ecore_con_url_cookies_example \
@@ -42,8 +44,12 @@ ecore_event_example_02 \
42ecore_exe_example \ 44ecore_exe_example \
43ecore_exe_example_child \ 45ecore_exe_example_child \
44ecore_fd_handler_example \ 46ecore_fd_handler_example \
47ecore_fd_handler_gnutls_example \
48ecore_file_download_example \
45ecore_idler_example \ 49ecore_idler_example \
50ecore_imf_example \
46ecore_job_example \ 51ecore_job_example \
52ecore_pipe_gstreamer_example \
47ecore_pipe_simple_example \ 53ecore_pipe_simple_example \
48ecore_poller_example \ 54ecore_poller_example \
49ecore_server_bench \ 55ecore_server_bench \
@@ -92,12 +98,18 @@ ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
92ecore_client_bench_SOURCES = ecore_client_bench.c 98ecore_client_bench_SOURCES = ecore_client_bench.c
93ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD) 99ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD)
94 100
101ecore_con_client_example_SOURCES = ecore_con_client_example.c
102ecore_con_client_example_LDADD = $(ECORE_CON_COMMON_LDADD)
103
95ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c 104ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c
96ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD) 105ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD)
97 106
98ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c 107ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c
99ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD) 108ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD)
100 109
110ecore_con_server_example_SOURCES = ecore_con_server_example.c
111ecore_con_server_example_LDADD = $(ECORE_CON_COMMON_LDADD)
112
101ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c 113ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c
102ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD) 114ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD)
103 115
@@ -149,12 +161,24 @@ ecore_exe_example_child_LDADD = $(ECORE_COMMON_LDADD)
149ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c 161ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c
150ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD) 162ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD)
151 163
164ecore_fd_handler_gnutls_example_SOURCES = ecore_fd_handler_gnutls_example.c
165ecore_fd_handler_gnutls_example_LDADD = $(ECORE_COMMON_LDADD)
166
167ecore_file_download_example_SOURCES = ecore_file_download_example.c
168ecore_file_download_example_LDADD = $(ECORE_COMMON_LDADD)
169
152ecore_idler_example_SOURCES = ecore_idler_example.c 170ecore_idler_example_SOURCES = ecore_idler_example.c
153ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD) 171ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD)
154 172
173ecore_imf_example_SOURCES = ecore_imf_example.c
174ecore_imf_example_LDADD = $(ECORE_COMMON_LDADD)
175
155ecore_job_example_SOURCES = ecore_job_example.c 176ecore_job_example_SOURCES = ecore_job_example.c
156ecore_job_example_LDADD = $(ECORE_COMMON_LDADD) 177ecore_job_example_LDADD = $(ECORE_COMMON_LDADD)
157 178
179ecore_pipe_gstreamer_example_SOURCES = ecore_pipe_gstreamer_example.c
180ecore_pipe_gstreamer_example_LDADD = $(ECORE_COMMON_LDADD)
181
158ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c 182ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c
159ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD) 183ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD)
160 184
@@ -174,44 +198,48 @@ ecore_timer_example_SOURCES = ecore_timer_example.c
174ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD) 198ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD)
175 199
176SRCS = \ 200SRCS = \
177ecore_animator_example \ 201ecore_animator_example.c \
178ecore_client_bench \ 202ecore_audio_custom.c \
179ecore_con_client_simple_example \ 203ecore_audio_playback.c \
180ecore_con_lookup_example \ 204ecore_audio_to_ogg.c \
181ecore_con_server_http_example \ 205ecore_client_bench.c \
182ecore_con_server_simple_example \ 206ecore_con_client_example.c \
183ecore_con_url_cookies_example \ 207ecore_con_client_simple_example.c \
184ecore_con_url_download_example \ 208ecore_con_lookup_example.c \
185ecore_con_url_headers_example \ 209ecore_con_server_example.c \
186ecore_evas_basics_example \ 210ecore_con_server_http_example.c \
187ecore_evas_buffer_example_01 \ 211ecore_con_server_simple_example.c \
188ecore_evas_buffer_example_02 \ 212ecore_con_url_cookies_example.c \
189ecore_evas_callbacks \ 213ecore_con_url_download_example.c \
190ecore_evas_ews_example \ 214ecore_con_url_headers_example.c \
191ecore_evas_object_example \ 215ecore_evas_basics_example.c \
192ecore_evas_window_sizes_example \ 216ecore_evas_buffer_example_01.c \
193ecore_event_example_01 \ 217ecore_evas_buffer_example_02.c \
194ecore_event_example_02 \ 218ecore_evas_callbacks.c \
195ecore_exe_example \ 219ecore_evas_ews_example.c \
196ecore_exe_example_child \ 220ecore_evas_object_example.c \
197ecore_fd_handler_example \ 221ecore_evas_window_sizes_example.c \
198ecore_idler_example \ 222ecore_event_example_01.c \
199ecore_job_example \ 223ecore_event_example_02.c \
200ecore_pipe_simple_example \ 224ecore_exe_example.c \
201ecore_poller_example \ 225ecore_exe_example_child.c \
202ecore_server_bench \ 226ecore_fd_handler_example.c \
203ecore_thread_example \ 227ecore_fd_handler_gnutls_example.c \
204ecore_time_functions_example \ 228ecore_file_download_example.c \
205ecore_timer_example 229ecore_idler_example.c \
206 230ecore_imf_example.c \
207if HAVE_ECORE_AUDIO 231ecore_job_example.c \
208SRCS += \ 232ecore_pipe_gstreamer_example.c \
209ecore_audio_custom \ 233ecore_pipe_simple_example.c \
210ecore_audio_playback \ 234ecore_poller_example.c \
211ecore_audio_to_ogg 235ecore_server_bench.c \
212endif 236ecore_thread_example.c \
213 237ecore_time_functions_example.c \
214EXTRA_DIST = red.png 238ecore_timer_example.c
239
240DATA_FILES = red.png
241
242EXTRA_DIST = $(DATA_FILES)
215 243
216examples: $(EXTRA_PROGRAMS) 244examples: $(EXTRA_PROGRAMS)
217 245
@@ -220,11 +248,9 @@ clean-local:
220 248
221install-examples: 249install-examples:
222 mkdir -p $(datadir)/ecore/examples 250 mkdir -p $(datadir)/ecore/examples
223 $(install_sh_DATA) -c $(SRCS) $(datadir)/ecore/examples 251 $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ecore/examples
224 $(install_sh_DATA) -c red.png $(datadir)/ecore/examples
225 252
226uninstall-local: 253uninstall-local:
227 rm -f $(datadir)/ecore/examples/red.png 254 for f in $(SRCS) $(DATA_FILES); do \
228 for f in $(SRCS) ; do \
229 rm -f $(datadir)/ecore/examples/$$f ; \ 255 rm -f $(datadir)/ecore/examples/$$f ; \
230 done 256 done
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index 2b9d04a380..a07080114e 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -54,19 +54,25 @@ table.edc \
54text.edc \ 54text.edc \
55toggle_using_filter.edc 55toggle_using_filter.edc
56 56
57DIST_EDCS = $(EDCS)
58
59MULTISENSE_EDCS = multisense.edc
57if ENABLE_MULTISENSE 60if ENABLE_MULTISENSE
58EDCS += multisense.edc 61EDCS += $(MULTISENSE_EDCS)
59endif 62endif
63DIST_EDCS += $(MULTISENSE_EDCS)
60 64
61if HAVE_EPHYSICS 65PHYSICS_EDCS = \
62EDCS += \
63physics_3d.edc \ 66physics_3d.edc \
64physics_actions.edc \ 67physics_actions.edc \
65physics_backcull.edc \ 68physics_backcull.edc \
66physics_basic.edc \ 69physics_basic.edc \
67physics_complex.edc \ 70physics_complex.edc \
68physics_soft_bodies.edc 71physics_soft_bodies.edc
72if HAVE_EPHYSICS
73EDCS += $(PHYSICS_EDCS)
69endif 74endif
75DIST_EDCS += $(PHYSICS_EDCS)
70 76
71.edc.edj: 77.edc.edj:
72 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F) 78 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
@@ -103,7 +109,7 @@ signals2.c \
103edje-swallow2.c \ 109edje-swallow2.c \
104edje-multisense.c 110edje-multisense.c
105 111
106EXTRA_DIST = $(EDCS) $(DATA_FILES) 112EXTRA_DIST = $(DIST_EDCS) $(DATA_FILES)
107 113
108AM_CPPFLAGS = \ 114AM_CPPFLAGS = \
109-I. \ 115-I. \
@@ -146,6 +152,7 @@ codegen_example_generated.c \
146codegen_example_generated.h 152codegen_example_generated.h
147 153
148EXTRA_PROGRAMS = \ 154EXTRA_PROGRAMS = \
155edje_example \
149edje-animations \ 156edje-animations \
150edje-basic \ 157edje-basic \
151edje-box \ 158edje-box \
@@ -194,9 +201,9 @@ clean-local:
194 201
195install-examples: 202install-examples:
196 mkdir -p $(datadir)/edje/examples 203 mkdir -p $(datadir)/edje/examples
197 $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/edje/examples 204 $(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples
198 205
199uninstall-local: 206uninstall-local:
200 for f in $(SRCS) $(EDCS) $(DATA_FILES); do \ 207 for f in $(SRCS) $(DIST_EDCS) $(DATA_FILES); do \
201 rm -f $(datadir)/edje/examples/$$f ; \ 208 rm -f $(datadir)/edje/examples/$$f ; \
202 done 209 done
diff --git a/src/examples/ephysics/Makefile.am b/src/examples/ephysics/Makefile.am
index 2937404001..2e9b3e738e 100644
--- a/src/examples/ephysics/Makefile.am
+++ b/src/examples/ephysics/Makefile.am
@@ -47,10 +47,12 @@ test_slider.c \
47test_velocity.c 47test_velocity.c
48 48
49EXTRA_PROGRAMS = 49EXTRA_PROGRAMS =
50
51# NOTE: neither ephysics_test or ephysics_logo won't be built as they needs Elementary 50# NOTE: neither ephysics_test or ephysics_logo won't be built as they needs Elementary
52# TODO: convert these to bare ecore_evas, at least a reduced set to have compile-able examples 51# TODO: convert these to bare ecore_evas, at least a reduced set to have compile-able examples
53 52
53# TODO: when EXTRA_PROGRAMS is populated, remove SRCS from here
54EXTRA_DIST = $(SRCS)
55
54# ephysics_test_SOURCES = \ 56# ephysics_test_SOURCES = \
55# ephysics_test.h \ 57# ephysics_test.h \
56# test_bouncing_ball.c \ 58# test_bouncing_ball.c \
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index c73b42098f..e1c484aaf2 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,5 +1,14 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
4EDJE_CC_FLAGS_VERBOSE_0 =
5EDJE_CC_FLAGS_VERBOSE_1 = -v
6EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
7
8AM_V_EDJ = $(am__v_EDJ_$(V))
9am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
10am__v_EDJ_0 = @echo " EDJ " $@;
11
3AM_CPPFLAGS = \ 12AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/eina \ 13-I$(top_srcdir)/src/lib/eina \
5-I$(top_srcdir)/src/lib/eo \ 14-I$(top_srcdir)/src/lib/eo \
@@ -9,18 +18,15 @@ AM_CPPFLAGS = \
9-I$(top_builddir)/src/lib/evas \ 18-I$(top_builddir)/src/lib/evas \
10@EVAS_CFLAGS@ 19@EVAS_CFLAGS@
11 20
12#put here all EDCs one needs to the tests
13EDCS = aspect.edc 21EDCS = aspect.edc
14 22
15EXTRA_PROGRAMS = 23EXTRA_PROGRAMS =
16 24
17if BUILD_ENGINE_BUFFER
18AM_CPPFLAGS += -I$(top_srcdir)/src/modules/evas/engines/buffer 25AM_CPPFLAGS += -I$(top_srcdir)/src/modules/evas/engines/buffer
19 26
20EXTRA_PROGRAMS += evas_buffer_simple 27EXTRA_PROGRAMS += evas_buffer_simple
21evas_buffer_simple_SOURCES = evas-buffer-simple.c 28evas_buffer_simple_SOURCES = evas-buffer-simple.c
22evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@ 29evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
23endif
24 30
25EXTRA_PROGRAMS += evas_init_shutdown 31EXTRA_PROGRAMS += evas_init_shutdown
26evas_init_shutdown_SOURCES = evas-init-shutdown.c 32evas_init_shutdown_SOURCES = evas-init-shutdown.c
@@ -51,6 +57,48 @@ $(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
51$(top_builddir)/src/lib/evas/libevas.la \ 57$(top_builddir)/src/lib/evas/libevas.la \
52@EVAS_LDFLAGS@ 58@EVAS_LDFLAGS@
53 59
60# EDJE_COMMON_* is similar to src/examples/edje/Makefile.am
61EDJE_COMMON_CPPFLAGS = \
62-I$(top_srcdir)/src/lib/eina \
63-I$(top_builddir)/src/lib/eina \
64-I$(top_srcdir)/src/lib/eo \
65-I$(top_builddir)/src/lib/eo \
66-I$(top_srcdir)/src/lib/eet \
67-I$(top_builddir)/src/lib/eet \
68-I$(top_srcdir)/src/lib/evas \
69-I$(top_builddir)/src/lib/evas \
70-I$(top_srcdir)/src/lib/ecore \
71-I$(top_builddir)/src/lib/ecore \
72-I$(top_srcdir)/src/lib/ecore_evas \
73-I$(top_builddir)/src/lib/ecore_evas \
74-I$(top_srcdir)/src/lib/ecore_file \
75-I$(top_builddir)/src/lib/ecore_file \
76-I$(top_srcdir)/src/lib/ecore_input \
77-I$(top_builddir)/src/lib/ecore_input \
78-I$(top_srcdir)/src/lib/ecore_imf \
79-I$(top_builddir)/src/lib/ecore_imf \
80-I$(top_srcdir)/src/lib/embryo \
81-I$(top_builddir)/src/lib/embryo \
82-I$(top_srcdir)/src/lib/edje \
83-I$(top_srcdir)/src/lib/edje/include \
84-DPACKAGE_EXAMPLES_DIR=\".\" \
85@EVAS_CFLAGS@
86
87EDJE_COMMON_LDADD = \
88$(top_builddir)/src/lib/eina/libeina.la \
89$(top_builddir)/src/lib/eo/libeo.la \
90$(top_builddir)/src/lib/eet/libeet.la \
91$(top_builddir)/src/lib/evas/libevas.la \
92$(top_builddir)/src/lib/ecore/libecore.la \
93$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
94$(top_builddir)/src/lib/ecore_file/libecore_file.la \
95$(top_builddir)/src/lib/ecore_input/libecore_input.la \
96$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
97$(top_builddir)/src/lib/ecore_imf/libecore_imf_evas.la \
98$(top_builddir)/src/lib/embryo/libembryo.la \
99$(top_builddir)/src/lib/edje/libedje.la \
100@EVAS_LDFLAGS@
101
54EXTRA_PROGRAMS += evas_images 102EXTRA_PROGRAMS += evas_images
55evas_images_SOURCES = evas-images.c 103evas_images_SOURCES = evas-images.c
56evas_images_LDADD = $(ECORE_EVAS_COMMON_LDADD) 104evas_images_LDADD = $(ECORE_EVAS_COMMON_LDADD)
@@ -111,71 +159,64 @@ evas_box_SOURCES = evas-box.c
111evas_box_LDADD = $(ECORE_EVAS_COMMON_LDADD) 159evas_box_LDADD = $(ECORE_EVAS_COMMON_LDADD)
112evas_box_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) 160evas_box_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
113 161
114#the ones using ecore_evas and edje follow 162EXTRA_PROGRAMS += evas_map_utils
115#AM_CPPFLAGS += @EDJE_CFLAGS@ 163evas_map_utils_SOURCES = evas-map-utils.c
116 164evas_map_utils_LDADD = $(ECORE_EVAS_COMMON_LDADD)
117#EXTRA_PROGRAMS += evas_aspect_hints 165evas_map_utils_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
118#evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
119#evas_aspect_hints_SOURCES = evas-aspect-hints.c
120#evas_aspect_hints_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@ @EDJE_LIBS@
121
122#EXTRA_PROGRAMS += evas_map_utils
123#evas_map_utils_SOURCES = evas-map-utils.c
124#evas_map_utils_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
125 166
126#aspect.edj: ${evas_aspect_hints_DEPS} 167EXTRA_PROGRAMS += evas_table
168evas_table_SOURCES = evas-table.c
169evas_table_LDADD = $(ECORE_EVAS_COMMON_LDADD)
170evas_table_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
127 171
128#.edc.edj: 172.edc.edj:
129# $(edje_cc) -v -id $(srcdir) $< $(builddir)/$(@F) 173 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $(builddir)/$(@F)
130 174
131#EDJS = $(EDCS:%.edc=%.edj) 175EXTRA_PROGRAMS += evas_aspect_hints
176evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
177evas_aspect_hints_SOURCES = evas-aspect-hints.c
178evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
179evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
132 180
133#SRCS = $(EDJS) 181EDJS = $(EDCS:%.edc=%.edj)
134 182
135#SRCS += $(EDCS) 183SRCS = \
136SRCS = $(EDCS) 184evas-aspect-hints.c \
137 185evas-box.c \
138SRCS += \
139enlightenment.png \
140red.png \
141im1.png \
142cube1.png
143
144SRCS += \
145evas-buffer-simple.c \ 186evas-buffer-simple.c \
146evas-init-shutdown.c \ 187evas-events.c \
188evas-hints.c \
147evas-images.c \ 189evas-images.c \
148evas-images2.c \ 190evas-images2.c \
149evas-images3.c \ 191evas-images3.c \
150evas-object-manipulation.c \ 192evas-init-shutdown.c \
151evas-object-manipulation-eo.c \
152evas-events.c \
153evas-aspect-hints.c \
154evas-hints.c \
155evas-stacking.c \
156evas-map-utils.c \ 193evas-map-utils.c \
157evas-text.c \ 194evas-object-manipulation-eo.c \
158evas-smart-object.c \ 195evas-object-manipulation.c \
159evas-smart-interface.c \ 196evas-smart-interface.c \
160evas-box.c 197evas-smart-object.c \
198evas-stacking.c \
199evas-table.c \
200evas-text.c
201
202DATA_FILES = \
203enlightenment.png \
204red.png \
205im1.png \
206cube1.png
161 207
162examples: $(EXTRA_PROGRAMS) 208examples: $(EXTRA_PROGRAMS) $(EDJS)
163 209
164clean-local: 210clean-local:
165 rm -f $(EXTRA_PROGRAMS) 211 rm -f $(EXTRA_PROGRAMS) $(EDJS)
166 212
167install-examples: 213install-examples:
168 mkdir -p $(datadir)/evas/examples 214 mkdir -p $(datadir)/evas/examples
169 $(install_sh_DATA) -c $(SRCS) $(datadir)/evas/examples 215 $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/evas/examples
170 216
171uninstall-local: 217uninstall-local:
172 for f in $(SRCS) ; do \ 218 for f in $(SRCS) $(EDCS) $(DATA_FILES); do \
173 rm -f $(datadir)/evas/examples/$$f ; \ 219 rm -f $(datadir)/evas/examples/$$f ; \
174 done 220 done
175 221
176EXTRA_DIST = \ 222EXTRA_DIST = $(EDCS) $(DATA_FILES)
177$(EDCS) \
178enlightenment.png \
179red.png \
180im1.png \
181cube1.png
diff --git a/src/static_libs/liblinebreak/LineBreak1.sed b/src/static_libs/liblinebreak/LineBreak1.sed
deleted file mode 100644
index 1be9651f3f..0000000000
--- a/src/static_libs/liblinebreak/LineBreak1.sed
+++ /dev/null
@@ -1 +0,0 @@
1s/\(^[0-9A-F.]\{1,\};[A-Z][A-Z0-9]\) #.*/\1/p
diff --git a/src/static_libs/liblinebreak/LineBreak2.sed b/src/static_libs/liblinebreak/LineBreak2.sed
deleted file mode 100644
index 81659585ab..0000000000
--- a/src/static_libs/liblinebreak/LineBreak2.sed
+++ /dev/null
@@ -1,2 +0,0 @@
1s/^\([0-9A-F]\{1,\}\);/\1..\1;/
2s/^\([0-9A-F]\{1,\}\)\.\.\([0-9A-F]\{1,\}\);\([A-Z][A-Z0-9]\)/ { 0x\1, 0x\2, LBP_\3 },/
diff --git a/src/static_libs/liblinebreak/filter_dup.c b/src/static_libs/liblinebreak/filter_dup.c
deleted file mode 100644
index 1d1d7936ab..0000000000
--- a/src/static_libs/liblinebreak/filter_dup.c
+++ /dev/null
@@ -1,48 +0,0 @@
1#include <stdio.h>
2#include <string.h>
3
4int main()
5{
6 char s[80];
7 char beg[16];
8 char end[16];
9 char prop[16];
10 char lastbeg[16];
11 char lastend[16];
12 char lastprop[16];
13 lastprop[0] = 0;
14 for (;;)
15 {
16 if (fgets(s, sizeof s, stdin) == NULL)
17 break;
18 if (strstr(s, "LBP_") == NULL || strstr(s, "LBP_Undef") != NULL)
19 {
20 if (lastprop[0])
21 {
22 printf("\t{ %s %s %s },\n", lastbeg, lastend, lastprop);
23 lastprop[0] = 0;
24 }
25 printf("%s", s);
26 continue;
27 }
28 sscanf(s, "\t{ %s %s %s }", beg, end, prop);
29 /*printf("==>\t{ \"%s\" \"%s\" \"%s\" },\n", beg, end, prop);*/
30 if (lastprop[0] && strcmp(lastprop, prop) != 0)
31 {
32 printf("\t{ %s %s %s },\n", lastbeg, lastend, lastprop);
33 lastprop[0] = 0;
34 }
35 if (lastprop[0] == 0)
36 {
37 strcpy(lastbeg, beg);
38 strcpy(lastprop, prop);
39 }
40 strcpy(lastend, end);
41 }
42 if (lastprop[0])
43 {
44 printf("\t{ %s %s %s },\n", lastbeg, lastend, prop);
45 }
46 return 0;
47}
48
diff --git a/src/static_libs/liblinebreak/gen_linebreak_data.sh b/src/static_libs/liblinebreak/gen_linebreak_data.sh
deleted file mode 100755
index e396db26f4..0000000000
--- a/src/static_libs/liblinebreak/gen_linebreak_data.sh
+++ /dev/null
@@ -1,11 +0,0 @@
1#!/bin/sh
2if [ ! -f "LineBreak.txt" ]; then
3 wget http://unicode.org/Public/UNIDATA/LineBreak.txt
4fi
5
6sed -n -f LineBreak1.sed LineBreak.txt > tmp.txt
7sed -f LineBreak2.sed tmp.txt | ./filter_dup > tmp.c
8head -2 LineBreak.txt > tmp.txt
9cat linebreakdata1.tmpl tmp.txt linebreakdata2.tmpl tmp.c linebreakdata3.tmpl > linebreakdata.c
10rm tmp.txt tmp.c
11
diff --git a/src/static_libs/liblinebreak/gen_wordbreak_data.sh b/src/static_libs/liblinebreak/gen_wordbreak_data.sh
deleted file mode 100755
index 7c84de22b6..0000000000
--- a/src/static_libs/liblinebreak/gen_wordbreak_data.sh
+++ /dev/null
@@ -1,25 +0,0 @@
1#!/bin/sh
2FNAME="WordBreakProperty.txt";
3if [ ! -f ${FNAME} ]; then
4 wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt
5fi
6
7#
8sed -n 's/\(^[0-9A-F.]\+\)/\1/p' ${FNAME} > tmp.txt
9sed -i 's/^\([0-9A-F]\+\)\s\+/\1..\1/' tmp.txt
10sort --numeric-sort tmp.txt > tmp2.txt
11./sort_numeric_hex.py tmp2.txt > tmp.txt
12rm tmp2.txt
13sed -i -n 's/^\([0-9A-F]\+\)..\([0-9A-F]\+\)\s*;\s*\([A-Za-z]\+\).*$/\t{0x\1, 0x\2, WBP_\3},/p' tmp.txt
14
15echo "/* The content of this file is generated from:" > wordbreakdata.x
16head -2 ${FNAME} >> wordbreakdata.x
17echo "*/" >> wordbreakdata.x
18echo '#include "linebreak.h"' >> wordbreakdata.x
19echo '#include "wordbreakdef.h"' >> wordbreakdata.x
20echo "static struct WordBreakProperties wb_prop_default[] = {" >> wordbreakdata.x
21cat tmp.txt >> wordbreakdata.x
22echo " {0xFFFFFFFF, 0xFFFFFFFF, WBP_Undefined}" >> wordbreakdata.x
23echo "};" >> wordbreakdata.x
24rm tmp.txt
25
diff --git a/src/static_libs/liblinebreak/linebreakdata1.tmpl b/src/static_libs/liblinebreak/linebreakdata1.tmpl
deleted file mode 100644
index df06125021..0000000000
--- a/src/static_libs/liblinebreak/linebreakdata1.tmpl
+++ /dev/null
@@ -1 +0,0 @@
1/* The content of this file is generated from:
diff --git a/src/static_libs/liblinebreak/linebreakdata2.tmpl b/src/static_libs/liblinebreak/linebreakdata2.tmpl
deleted file mode 100644
index 60d0d37758..0000000000
--- a/src/static_libs/liblinebreak/linebreakdata2.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
1*/
2
3#include "linebreak.h"
4#include "linebreakdef.h"
5
6/** Default line breaking properties as from the Unicode Web site. */
7struct LineBreakProperties lb_prop_default[] = {
diff --git a/src/static_libs/liblinebreak/linebreakdata3.tmpl b/src/static_libs/liblinebreak/linebreakdata3.tmpl
deleted file mode 100644
index a77017c0d7..0000000000
--- a/src/static_libs/liblinebreak/linebreakdata3.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
1 { 0xFFFFFFFF, 0xFFFFFFFF, LBP_Undefined }
2};
diff --git a/src/static_libs/liblinebreak/sort_numeric_hex.py b/src/static_libs/liblinebreak/sort_numeric_hex.py
deleted file mode 100755
index a16d0f38c8..0000000000
--- a/src/static_libs/liblinebreak/sort_numeric_hex.py
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/usr/bin/env python2
2import sys
3
4lines = open(sys.argv[1]).readlines()
5lines_out = sorted(lines, key=lambda line: int(line.split("..")[0], 16))
6map(sys.stdout.write, lines_out)