aboutsummaryrefslogtreecommitdiffstats
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
parentefl/ecore_fb: remove deprecated files. (diff)
downloadefl-2b29626d8d5aa47119759d0ef1d0876674f06254.tar.gz
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
lib_LTLIBRARIES =
bin_PROGRAMS =
+bin_SCRIPTS =
noinst_PROGRAMS =
check_PROGRAMS =
EXTRA_DIST =
-if HAVE_WINDOWS
include Makefile_Evil.am
-endif
-
-if HAVE_PS3
include Makefile_Escape.am
-endif
include Makefile_Eina.am
include Makefile_Eo.am
@@ -28,45 +24,23 @@ include Makefile_Ecore_Con.am
include Makefile_Ecore_Ipc.am
include Makefile_Ecore_File.am
include Makefile_Ecore_Input.am
-if HAVE_ECORE_COCOA
include Makefile_Ecore_Cocoa.am
-endif
-if HAVE_ECORE_FB
include Makefile_Ecore_FB.am
-endif
-if HAVE_PS3
include Makefile_Ecore_Psl1ght.am
-endif
-if HAVE_ECORE_SDL
include Makefile_Ecore_SDL.am
-endif
-if HAVE_ECORE_WAYLAND
include Makefile_Ecore_Wayland.am
-endif
-if HAVE_WIN32
include Makefile_Ecore_Win32.am
-endif
-if HAVE_WINCE
include Makefile_Ecore_WinCE.am
-endif
-if HAVE_ECORE_X
include Makefile_Ecore_X.am
-endif
include Makefile_Ecore_Imf.am
include Makefile_Ecore_Evas.am
-if HAVE_ECORE_AUDIO
include Makefile_Ecore_Audio.am
-endif
include Makefile_Embryo.am
include Makefile_Eio.am
include Makefile_EDBus.am
include Makefile_Efreet.am
-if HAVE_EEZE
include Makefile_Eeze.am
-endif
-if HAVE_EPHYSICS
include Makefile_EPhysics.am
-endif
include Makefile_Edje.am
.PHONY: benchmark examples
@@ -75,7 +49,7 @@ benchmark:
@$(MAKE) $(AM_MAKEFLAGS)
@$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark
-examples:
+examples: $(lib_LTLIBRARIES) $(bin_PROGRAMS)
@make
@$(MAKE) $(AM_MAKEFLAGS) -C examples examples
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 @@
+if HAVE_EPHYSICS
### Library
@@ -47,3 +48,4 @@ lib/evas/libevas.la \
lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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
if HAVE_WINCE
lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_wince.c
else
+EXTRA_DIST += lib/ecore/ecore_exe_ps3.c
#if ECORE_HAVE_PS3
#libecore_la_SOURCES += ecore_exe_ps3.c
#else
@@ -112,3 +113,7 @@ tests_ecore_ecore_suite_LDADD += lib/ecore_audio/libecore_audio.la
endif
endif
+
+EXTRA_DIST += \
+tests/ecore/modem.wav \
+tests/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 @@
+if HAVE_ECORE_AUDIO
### Library
@@ -35,3 +36,5 @@ lib/eina/libeina.la \
@EFL_COV_LIBS@
lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
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 @@
+if HAVE_ECORE_COCOA
### Library
@@ -31,3 +32,4 @@ lib/eina/libeina.la \
@ECORE_COCOA_LIBS@
lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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 @@
+if HAVE_ECORE_FB
### Library
@@ -14,9 +15,6 @@ lib/ecore_fb/ecore_fb_ts.c \
lib/ecore_fb/ecore_fb_vt.c \
lib/ecore_fb/ecore_fb_keytable.h \
lib/ecore_fb/ecore_fb_private.h
-# deprecated sources (might not compile):
-# lib/ecore_fb/ecore_fb_kbd.c
-# lib/ecore_fb/ecore_fb_ps2.c
lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
@@ -36,3 +34,4 @@ lib/eina/libeina.la \
@ECORE_FB_LIBS@
lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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 @@
+if HAVE_PS3
### Library
@@ -10,7 +11,9 @@ lib/ecore_psl1ght/Ecore_Psl1ght.h
lib_ecore_psl1ght_libecore_psl1ght_la_SOURCES = \
lib/ecore_psl1ght/ecore_psl1ght.c \
lib/ecore_psl1ght/moveutil.c \
+lib/ecore_psl1ght/moveutil.h \
lib/ecore_psl1ght/spursutil.c \
+lib/ecore_psl1ght/spursutil.h \
lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
lib/ecore_psl1ght/ecore_psl1ght_private.h
@@ -32,3 +35,9 @@ lib/eo/libeo.la \
lib/eina/libeina.la
lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
+
+# TODO: what are they used for?
+EXTRA_DIST += \
+lib/ecore_psl1ght/gemutil.c \
+lib/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 @@
+if HAVE_ECORE_SDL
### Library
@@ -31,3 +32,4 @@ lib/eina/libeina.la \
@ECORE_SDL_LIBS@
lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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 @@
+if HAVE_ECORE_WAYLAND
### Library
@@ -33,3 +34,4 @@ lib/eina/libeina.la \
@ECORE_WAYLAND_LIBS@
lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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 @@
+if HAVE_WIN32
### Library
@@ -44,3 +45,4 @@ lib/evil/libevil.la \
@ECORE_WIN32_LIBS@
lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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 @@
+if HAVE_WINCE
### Library
@@ -34,3 +35,4 @@ lib/evil/libevil.la \
@ECORE_WINCE_LIBS@
lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
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 @@
+if HAVE_ECORE_X
### Library
@@ -141,5 +142,6 @@ noinst_PROGRAMS += utils/ecore/makekeys
utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
+endif
EXTRA_DIST += utils/ecore/mkks.sh
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) \
EXTRA_DIST += \
bin/edje/edje_convert.h \
bin/edje/edje_convert.c \
-bin/edje/edje_data_convert.c
+bin/edje/edje_data_convert.c \
+bin/edje/edje_convert_main.c \
+lib/edje/edje_convert.c
+
+bin_SCRIPTS += bin/edje/edje_recc
### Unit tests
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 @@
+if HAVE_EEZE
### Library
@@ -166,3 +167,4 @@ $(EEZE_COMMON_CPPFLAGS) \
tests_eeze_eeze_suite_LDADD = $(EEZE_COMMON_USER_LDADD) @CHECK_LIBS@
endif
+endif
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@
tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@
endif
+
+EXTRA_DIST += \
+tests/efreet/data/entry \
+tests/efreet/data/entry.png \
+tests/efreet/data/long.ini \
+tests/efreet/data/preferences.menu \
+tests/efreet/data/sub/Makefile.am \
+tests/efreet/data/sub/test.desktop \
+tests/efreet/data/test.desktop \
+tests/efreet/data/test_garbage \
+tests/efreet/data/test.ini \
+tests/efreet/data/test.menu \
+tests/efreet/data/test_menu_bad_comment.menu \
+tests/efreet/data/test_menu_slash_bad.menu \
+tests/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@
### Script
-bin_SCRIPTS = scripts/eina/eina-bench-cmp
+bin_SCRIPTS += scripts/eina/eina-bench-cmp
### Unit tests
@@ -325,7 +325,7 @@ tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
endif
EXTRA_DIST += \
-lib/eina/eina_config.h.in \
lib/eina/eina_strbuf_template_c.x \
lib/eina/eina_binbuf_template_c.x \
+tests/eina/sample.gpx \
$(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
bin_embryo_embryo_cc_SOURCES = \
bin/embryo/embryo_cc_amx.h \
+bin/embryo/embryo_cc_osdefs.h \
bin/embryo/embryo_cc_sc.h \
bin/embryo/embryo_cc_sc1.c \
bin/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 @@
+if HAVE_PS3
### Library
@@ -22,3 +23,5 @@ lib_escape_libescape_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/escape
lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
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@
# Linebreak
EXTRA_DIST += \
-static_libs/liblinebreak/LineBreak1.sed \
-static_libs/liblinebreak/LineBreak2.sed \
-static_libs/liblinebreak/linebreakdata1.tmpl \
-static_libs/liblinebreak/linebreakdata2.tmpl \
-static_libs/liblinebreak/linebreakdata3.tmpl \
-static_libs/liblinebreak/LICENCE
+static_libs/liblinebreak/LICENCE \
+static_libs/liblinebreak/AUTHORS \
+static_libs/liblinebreak/NEWS \
+static_libs/liblinebreak/README \
+static_libs/liblinebreak/ChangeLog
# Engines
@@ -510,7 +509,9 @@ modules/evas/engines/gl_common/shader/img_bgra_vert.shd \
modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd \
modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd \
modules/evas/engines/gl_common/shader/img_mask_frag.h \
+modules/evas/engines/gl_common/shader/img_mask_frag.shd \
modules/evas/engines/gl_common/shader/img_mask_vert.h \
+modules/evas/engines/gl_common/shader/img_mask_vert.shd \
modules/evas/engines/gl_common/shader/yuv_frag.shd \
modules/evas/engines/gl_common/shader/yuv_vert.shd \
modules/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 @@
+if HAVE_WINDOWS
### Library
lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la
@@ -119,8 +120,6 @@ lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-EXTRA_DIST += lib/evil/gdtoa/README lib/evil/gdtoa/README.mingw
-
### Binary
bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil
@@ -152,7 +151,7 @@ bin/evil/evil_test_util.h
if HAVE_WINCE
bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
#else
-#suite_SOURCES += bin/evil/memcpy_glibc_i686.S
+#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
endif
bin_evil_evil_suite_CPPFLAGS = \
@@ -171,3 +170,9 @@ bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
bin_evil_test_evil_LDADD = \
lib/evil/libevil.la \
@EVIL_LDFLAGS@
+
+endif
+EXTRA_DIST += \
+lib/evil/gdtoa/README \
+lib/evil/gdtoa/README.mingw \
+bin/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 = \
EXTRA_PROGRAMS = \
ecore_animator_example \
ecore_client_bench \
+ecore_con_client_example \
ecore_con_client_simple_example \
ecore_con_lookup_example \
+ecore_con_server_example \
ecore_con_server_http_example \
ecore_con_server_simple_example \
ecore_con_url_cookies_example \
@@ -42,8 +44,12 @@ ecore_event_example_02 \
ecore_exe_example \
ecore_exe_example_child \
ecore_fd_handler_example \
+ecore_fd_handler_gnutls_example \
+ecore_file_download_example \
ecore_idler_example \
+ecore_imf_example \
ecore_job_example \
+ecore_pipe_gstreamer_example \
ecore_pipe_simple_example \
ecore_poller_example \
ecore_server_bench \
@@ -92,12 +98,18 @@ ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
ecore_client_bench_SOURCES = ecore_client_bench.c
ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD)
+ecore_con_client_example_SOURCES = ecore_con_client_example.c
+ecore_con_client_example_LDADD = $(ECORE_CON_COMMON_LDADD)
+
ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c
ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD)
ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c
ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD)
+ecore_con_server_example_SOURCES = ecore_con_server_example.c
+ecore_con_server_example_LDADD = $(ECORE_CON_COMMON_LDADD)
+
ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c
ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD)
@@ -149,12 +161,24 @@ ecore_exe_example_child_LDADD = $(ECORE_COMMON_LDADD)
ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c
ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD)
+ecore_fd_handler_gnutls_example_SOURCES = ecore_fd_handler_gnutls_example.c
+ecore_fd_handler_gnutls_example_LDADD = $(ECORE_COMMON_LDADD)
+
+ecore_file_download_example_SOURCES = ecore_file_download_example.c
+ecore_file_download_example_LDADD = $(ECORE_COMMON_LDADD)
+
ecore_idler_example_SOURCES = ecore_idler_example.c
ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD)
+ecore_imf_example_SOURCES = ecore_imf_example.c
+ecore_imf_example_LDADD = $(ECORE_COMMON_LDADD)
+
ecore_job_example_SOURCES = ecore_job_example.c
ecore_job_example_LDADD = $(ECORE_COMMON_LDADD)
+ecore_pipe_gstreamer_example_SOURCES = ecore_pipe_gstreamer_example.c
+ecore_pipe_gstreamer_example_LDADD = $(ECORE_COMMON_LDADD)
+
ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c
ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD)
@@ -174,44 +198,48 @@ ecore_timer_example_SOURCES = ecore_timer_example.c
ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD)
SRCS = \
-ecore_animator_example \
-ecore_client_bench \
-ecore_con_client_simple_example \
-ecore_con_lookup_example \
-ecore_con_server_http_example \
-ecore_con_server_simple_example \
-ecore_con_url_cookies_example \
-ecore_con_url_download_example \
-ecore_con_url_headers_example \
-ecore_evas_basics_example \
-ecore_evas_buffer_example_01 \
-ecore_evas_buffer_example_02 \
-ecore_evas_callbacks \
-ecore_evas_ews_example \
-ecore_evas_object_example \
-ecore_evas_window_sizes_example \
-ecore_event_example_01 \
-ecore_event_example_02 \
-ecore_exe_example \
-ecore_exe_example_child \
-ecore_fd_handler_example \
-ecore_idler_example \
-ecore_job_example \
-ecore_pipe_simple_example \
-ecore_poller_example \
-ecore_server_bench \
-ecore_thread_example \
-ecore_time_functions_example \
-ecore_timer_example
-
-if HAVE_ECORE_AUDIO
-SRCS += \
-ecore_audio_custom \
-ecore_audio_playback \
-ecore_audio_to_ogg
-endif
-
-EXTRA_DIST = red.png
+ecore_animator_example.c \
+ecore_audio_custom.c \
+ecore_audio_playback.c \
+ecore_audio_to_ogg.c \
+ecore_client_bench.c \
+ecore_con_client_example.c \
+ecore_con_client_simple_example.c \
+ecore_con_lookup_example.c \
+ecore_con_server_example.c \
+ecore_con_server_http_example.c \
+ecore_con_server_simple_example.c \
+ecore_con_url_cookies_example.c \
+ecore_con_url_download_example.c \
+ecore_con_url_headers_example.c \
+ecore_evas_basics_example.c \
+ecore_evas_buffer_example_01.c \
+ecore_evas_buffer_example_02.c \
+ecore_evas_callbacks.c \
+ecore_evas_ews_example.c \
+ecore_evas_object_example.c \
+ecore_evas_window_sizes_example.c \
+ecore_event_example_01.c \
+ecore_event_example_02.c \
+ecore_exe_example.c \
+ecore_exe_example_child.c \
+ecore_fd_handler_example.c \
+ecore_fd_handler_gnutls_example.c \
+ecore_file_download_example.c \
+ecore_idler_example.c \
+ecore_imf_example.c \
+ecore_job_example.c \
+ecore_pipe_gstreamer_example.c \
+ecore_pipe_simple_example.c \
+ecore_poller_example.c \
+ecore_server_bench.c \
+ecore_thread_example.c \
+ecore_time_functions_example.c \
+ecore_timer_example.c
+
+DATA_FILES = red.png
+
+EXTRA_DIST = $(DATA_FILES)
examples: $(EXTRA_PROGRAMS)
@@ -220,11 +248,9 @@ clean-local:
install-examples:
mkdir -p $(datadir)/ecore/examples
- $(install_sh_DATA) -c $(SRCS) $(datadir)/ecore/examples
- $(install_sh_DATA) -c red.png $(datadir)/ecore/examples
+ $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ecore/examples
uninstall-local:
- rm -f $(datadir)/ecore/examples/red.png
- for f in $(SRCS) ; do \
+ for f in $(SRCS) $(DATA_FILES); do \
rm -f $(datadir)/ecore/examples/$$f ; \
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 \
text.edc \
toggle_using_filter.edc
+DIST_EDCS = $(EDCS)
+
+MULTISENSE_EDCS = multisense.edc
if ENABLE_MULTISENSE
-EDCS += multisense.edc
+EDCS += $(MULTISENSE_EDCS)
endif
+DIST_EDCS += $(MULTISENSE_EDCS)
-if HAVE_EPHYSICS
-EDCS += \
+PHYSICS_EDCS = \
physics_3d.edc \
physics_actions.edc \
physics_backcull.edc \
physics_basic.edc \
physics_complex.edc \
physics_soft_bodies.edc
+if HAVE_EPHYSICS
+EDCS += $(PHYSICS_EDCS)
endif
+DIST_EDCS += $(PHYSICS_EDCS)
.edc.edj:
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
@@ -103,7 +109,7 @@ signals2.c \
edje-swallow2.c \
edje-multisense.c
-EXTRA_DIST = $(EDCS) $(DATA_FILES)
+EXTRA_DIST = $(DIST_EDCS) $(DATA_FILES)
AM_CPPFLAGS = \
-I. \
@@ -146,6 +152,7 @@ codegen_example_generated.c \
codegen_example_generated.h
EXTRA_PROGRAMS = \
+edje_example \
edje-animations \
edje-basic \
edje-box \
@@ -194,9 +201,9 @@ clean-local:
install-examples:
mkdir -p $(datadir)/edje/examples
- $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/edje/examples
+ $(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples
uninstall-local:
- for f in $(SRCS) $(EDCS) $(DATA_FILES); do \
+ for f in $(SRCS) $(DIST_EDCS) $(DATA_FILES); do \
rm -f $(datadir)/edje/examples/$$f ; \
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 \
test_velocity.c
EXTRA_PROGRAMS =
-
# NOTE: neither ephysics_test or ephysics_logo won't be built as they needs Elementary
# TODO: convert these to bare ecore_evas, at least a reduced set to have compile-able examples
+# TODO: when EXTRA_PROGRAMS is populated, remove SRCS from here
+EXTRA_DIST = $(SRCS)
+
# ephysics_test_SOURCES = \
# ephysics_test.h \
# 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 @@
MAINTAINERCLEANFILES = Makefile.in
+EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
+EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE_1 = -v
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
+
+AM_V_EDJ = $(am__v_EDJ_$(V))
+am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+am__v_EDJ_0 = @echo " EDJ " $@;
+
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
@@ -9,18 +18,15 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/evas \
@EVAS_CFLAGS@
-#put here all EDCs one needs to the tests
EDCS = aspect.edc
EXTRA_PROGRAMS =
-if BUILD_ENGINE_BUFFER
AM_CPPFLAGS += -I$(top_srcdir)/src/modules/evas/engines/buffer
EXTRA_PROGRAMS += evas_buffer_simple
evas_buffer_simple_SOURCES = evas-buffer-simple.c
evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
-endif
EXTRA_PROGRAMS += evas_init_shutdown
evas_init_shutdown_SOURCES = evas-init-shutdown.c
@@ -51,6 +57,48 @@ $(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
$(top_builddir)/src/lib/evas/libevas.la \
@EVAS_LDFLAGS@
+# EDJE_COMMON_* is similar to src/examples/edje/Makefile.am
+EDJE_COMMON_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/ecore_evas \
+-I$(top_srcdir)/src/lib/ecore_file \
+-I$(top_builddir)/src/lib/ecore_file \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/ecore_imf \
+-I$(top_srcdir)/src/lib/embryo \
+-I$(top_builddir)/src/lib/embryo \
+-I$(top_srcdir)/src/lib/edje \
+-I$(top_srcdir)/src/lib/edje/include \
+-DPACKAGE_EXAMPLES_DIR=\".\" \
+@EVAS_CFLAGS@
+
+EDJE_COMMON_LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/evas/libevas.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(top_builddir)/src/lib/ecore_file/libecore_file.la \
+$(top_builddir)/src/lib/ecore_input/libecore_input.la \
+$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
+$(top_builddir)/src/lib/ecore_imf/libecore_imf_evas.la \
+$(top_builddir)/src/lib/embryo/libembryo.la \
+$(top_builddir)/src/lib/edje/libedje.la \
+@EVAS_LDFLAGS@
+
EXTRA_PROGRAMS += evas_images
evas_images_SOURCES = evas-images.c
evas_images_LDADD = $(ECORE_EVAS_COMMON_LDADD)
@@ -111,71 +159,64 @@ evas_box_SOURCES = evas-box.c
evas_box_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_box_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
-#the ones using ecore_evas and edje follow
-#AM_CPPFLAGS += @EDJE_CFLAGS@
-
-#EXTRA_PROGRAMS += evas_aspect_hints
-#evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
-#evas_aspect_hints_SOURCES = evas-aspect-hints.c
-#evas_aspect_hints_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@ @EDJE_LIBS@
-
-#EXTRA_PROGRAMS += evas_map_utils
-#evas_map_utils_SOURCES = evas-map-utils.c
-#evas_map_utils_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
+EXTRA_PROGRAMS += evas_map_utils
+evas_map_utils_SOURCES = evas-map-utils.c
+evas_map_utils_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_map_utils_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
-#aspect.edj: ${evas_aspect_hints_DEPS}
+EXTRA_PROGRAMS += evas_table
+evas_table_SOURCES = evas-table.c
+evas_table_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_table_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
-#.edc.edj:
-# $(edje_cc) -v -id $(srcdir) $< $(builddir)/$(@F)
+.edc.edj:
+ $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $(builddir)/$(@F)
-#EDJS = $(EDCS:%.edc=%.edj)
+EXTRA_PROGRAMS += evas_aspect_hints
+evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
+evas_aspect_hints_SOURCES = evas-aspect-hints.c
+evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
-#SRCS = $(EDJS)
+EDJS = $(EDCS:%.edc=%.edj)
-#SRCS += $(EDCS)
-SRCS = $(EDCS)
-
-SRCS += \
-enlightenment.png \
-red.png \
-im1.png \
-cube1.png
-
-SRCS += \
+SRCS = \
+evas-aspect-hints.c \
+evas-box.c \
evas-buffer-simple.c \
-evas-init-shutdown.c \
+evas-events.c \
+evas-hints.c \
evas-images.c \
evas-images2.c \
evas-images3.c \
-evas-object-manipulation.c \
-evas-object-manipulation-eo.c \
-evas-events.c \
-evas-aspect-hints.c \
-evas-hints.c \
-evas-stacking.c \
+evas-init-shutdown.c \
evas-map-utils.c \
-evas-text.c \
-evas-smart-object.c \
+evas-object-manipulation-eo.c \
+evas-object-manipulation.c \
evas-smart-interface.c \
-evas-box.c
+evas-smart-object.c \
+evas-stacking.c \
+evas-table.c \
+evas-text.c
+
+DATA_FILES = \
+enlightenment.png \
+red.png \
+im1.png \
+cube1.png
-examples: $(EXTRA_PROGRAMS)
+examples: $(EXTRA_PROGRAMS) $(EDJS)
clean-local:
- rm -f $(EXTRA_PROGRAMS)
+ rm -f $(EXTRA_PROGRAMS) $(EDJS)
install-examples:
mkdir -p $(datadir)/evas/examples
- $(install_sh_DATA) -c $(SRCS) $(datadir)/evas/examples
+ $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/evas/examples
uninstall-local:
- for f in $(SRCS) ; do \
+ for f in $(SRCS) $(EDCS) $(DATA_FILES); do \
rm -f $(datadir)/evas/examples/$$f ; \
done
-EXTRA_DIST = \
-$(EDCS) \
-enlightenment.png \
-red.png \
-im1.png \
-cube1.png
+EXTRA_DIST = $(EDCS) $(DATA_FILES)
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 @@
-s/\(^[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 @@
-s/^\([0-9A-F]\{1,\}\);/\1..\1;/
-s/^\([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 @@
-#include <stdio.h>
-#include <string.h>
-
-int main()
-{
- char s[80];
- char beg[16];
- char end[16];
- char prop[16];
- char lastbeg[16];
- char lastend[16];
- char lastprop[16];
- lastprop[0] = 0;
- for (;;)
- {
- if (fgets(s, sizeof s, stdin) == NULL)
- break;
- if (strstr(s, "LBP_") == NULL || strstr(s, "LBP_Undef") != NULL)
- {
- if (lastprop[0])
- {
- printf("\t{ %s %s %s },\n", lastbeg, lastend, lastprop);
- lastprop[0] = 0;
- }
- printf("%s", s);
- continue;
- }
- sscanf(s, "\t{ %s %s %s }", beg, end, prop);
- /*printf("==>\t{ \"%s\" \"%s\" \"%s\" },\n", beg, end, prop);*/
- if (lastprop[0] && strcmp(lastprop, prop) != 0)
- {
- printf("\t{ %s %s %s },\n", lastbeg, lastend, lastprop);
- lastprop[0] = 0;
- }
- if (lastprop[0] == 0)
- {
- strcpy(lastbeg, beg);
- strcpy(lastprop, prop);
- }
- strcpy(lastend, end);
- }
- if (lastprop[0])
- {
- printf("\t{ %s %s %s },\n", lastbeg, lastend, prop);
- }
- return 0;
-}
-
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 @@
-#!/bin/sh
-if [ ! -f "LineBreak.txt" ]; then
- wget http://unicode.org/Public/UNIDATA/LineBreak.txt
-fi
-
-sed -n -f LineBreak1.sed LineBreak.txt > tmp.txt
-sed -f LineBreak2.sed tmp.txt | ./filter_dup > tmp.c
-head -2 LineBreak.txt > tmp.txt
-cat linebreakdata1.tmpl tmp.txt linebreakdata2.tmpl tmp.c linebreakdata3.tmpl > linebreakdata.c
-rm tmp.txt tmp.c
-
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 @@
-#!/bin/sh
-FNAME="WordBreakProperty.txt";
-if [ ! -f ${FNAME} ]; then
- wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt
-fi
-
-#
-sed -n 's/\(^[0-9A-F.]\+\)/\1/p' ${FNAME} > tmp.txt
-sed -i 's/^\([0-9A-F]\+\)\s\+/\1..\1/' tmp.txt
-sort --numeric-sort tmp.txt > tmp2.txt
-./sort_numeric_hex.py tmp2.txt > tmp.txt
-rm tmp2.txt
-sed -i -n 's/^\([0-9A-F]\+\)..\([0-9A-F]\+\)\s*;\s*\([A-Za-z]\+\).*$/\t{0x\1, 0x\2, WBP_\3},/p' tmp.txt
-
-echo "/* The content of this file is generated from:" > wordbreakdata.x
-head -2 ${FNAME} >> wordbreakdata.x
-echo "*/" >> wordbreakdata.x
-echo '#include "linebreak.h"' >> wordbreakdata.x
-echo '#include "wordbreakdef.h"' >> wordbreakdata.x
-echo "static struct WordBreakProperties wb_prop_default[] = {" >> wordbreakdata.x
-cat tmp.txt >> wordbreakdata.x
-echo " {0xFFFFFFFF, 0xFFFFFFFF, WBP_Undefined}" >> wordbreakdata.x
-echo "};" >> wordbreakdata.x
-rm tmp.txt
-
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 @@
-/* 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 @@
-*/
-
-#include "linebreak.h"
-#include "linebreakdef.h"
-
-/** Default line breaking properties as from the Unicode Web site. */
-struct 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 @@
- { 0xFFFFFFFF, 0xFFFFFFFF, LBP_Undefined }
-};
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 @@
-#!/usr/bin/env python2
-import sys
-
-lines = open(sys.argv[1]).readlines()
-lines_out = sorted(lines, key=lambda line: int(line.split("..")[0], 16))
-map(sys.stdout.write, lines_out)