From 73cc5e63514e41686015a796ccc5b17b50ffe3fe Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Tue, 25 Feb 2014 18:13:21 -0300 Subject: [PATCH] Enable installing examples binaries Change-Id: If903ba43c2c6591bd68c841b326d0e5a61dcdc10 Signed-off-by: Eduardo Lima (Etrunko) --- src/examples/ecore/Makefile.am | 17 +++++++++-------- src/examples/ecore_avahi/Makefile.am | 5 +++++ src/examples/edje/Makefile.am | 13 ++++--------- src/examples/eet/Makefile.am | 7 ++----- src/examples/eina/Makefile.am | 7 ++----- src/examples/eio/Makefile.am | 7 ++----- src/examples/eldbus/Makefile.am | 7 ++----- src/examples/emotion/Makefile.am | 7 ++----- src/examples/eo/Makefile.am | 7 ++----- src/examples/ephysics/Makefile.am | 7 ++----- src/examples/ethumb_client/Makefile.am | 7 ++----- src/examples/evas/Makefile.am | 9 +++------ 12 files changed, 37 insertions(+), 63 deletions(-) diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am index ac2926b..b3e0883 100644 --- a/src/examples/ecore/Makefile.am +++ b/src/examples/ecore/Makefile.am @@ -236,9 +236,6 @@ ecore_getopt_example_LDADD = $(ECORE_COMMON_LDADD) SRCS = \ ecore_animator_example.c \ -ecore_audio_custom.c \ -ecore_audio_playback.c \ -ecore_audio_to_ogg.c \ ecore_client_bench.c \ ecore_compose_get_example.c \ ecore_con_client_example.c \ @@ -278,11 +275,19 @@ ecore_time_functions_example.c \ ecore_timer_example.c \ ecore_getopt_example.c +if HAVE_ECORE_AUDIO +#SRCS += \ +#ecore_audio_custom.c \ +#ecore_audio_playback.c \ +#ecore_audio_to_ogg.c +endif + DATA_FILES = red.png Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/ecore/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -295,7 +300,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/ecore/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/ecore_avahi/Makefile.am b/src/examples/ecore_avahi/Makefile.am index 8ce9469..2ba7fb3 100644 --- a/src/examples/ecore_avahi/Makefile.am +++ b/src/examples/ecore_avahi/Makefile.am @@ -32,6 +32,11 @@ $(top_builddir)/src/lib/eina/libeina.la \ examples: $(EXTRA_PROGRAMS) +EXTRA_DIST = ecore_avahi_example.c + +examplesdir = $(libdir)/ecore_avahi/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) + clean-local: rm -f $(EXTRA_PROGRAMS) diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am index 9bc26d0..fe8ec77 100644 --- a/src/examples/edje/Makefile.am +++ b/src/examples/edje/Makefile.am @@ -192,12 +192,14 @@ if HAVE_EPHYSICS LDADD += $(top_builddir)/src/lib/ephysics/libephysics.la endif -examples: $(EXTRA_PROGRAMS) $(EDJS) +examplesdir = $(libdir)/edje/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) +examples_DATA = $(EDJS) clean-local: rm -f $(EXTRA_PROGRAMS) $(EDJS) $(CODEGEN_GENERATED) -install-examples: $(EDJS) +install-examples: mkdir -p $(datadir)/edje/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples cd $(builddir) && $(install_sh_DATA) -c $(EDJS) $(datadir)/edje/examples @@ -206,10 +208,3 @@ uninstall-local: for f in $(SRCS) $(DIST_EDCS) $(DATA_FILES); do \ rm -f $(datadir)/edje/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -if BUILD_LOADER_PNG -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -nodist_pkgdata_DATA = $(EDJS) -endif -endif diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am index 8095a3d..62853d2 100644 --- a/src/examples/eet/Makefile.am +++ b/src/examples/eet/Makefile.am @@ -44,7 +44,8 @@ DATA_FILES = Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/eet/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -57,7 +58,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/eet/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am index 227dba9..4e46fdf 100644 --- a/src/examples/eina/Makefile.am +++ b/src/examples/eina/Makefile.am @@ -146,7 +146,8 @@ DATA_FILES = addr_book.txt chat.xml Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/eina/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -159,7 +160,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/eina/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am index ea34e81..9754369 100644 --- a/src/examples/eio/Makefile.am +++ b/src/examples/eio/Makefile.am @@ -43,7 +43,8 @@ DATA_FILES = Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/eio/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -56,7 +57,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/eio/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/eldbus/Makefile.am b/src/examples/eldbus/Makefile.am index 6cb4da0..44c34e0 100644 --- a/src/examples/eldbus/Makefile.am +++ b/src/examples/eldbus/Makefile.am @@ -77,7 +77,8 @@ DATA_FILES = Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/eldbus/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -90,7 +91,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/eldbus/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/emotion/Makefile.am b/src/examples/emotion/Makefile.am index 8d5d959..a028b9b 100644 --- a/src/examples/emotion/Makefile.am +++ b/src/examples/emotion/Makefile.am @@ -43,7 +43,8 @@ DATA_FILES = Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examples_PROGRAMS = $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/emotion/examples clean-local: rm -f $(EXTRA_PROGRAMS) @@ -56,7 +57,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/emotion/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am index 5d3c0e7..b2a06ee 100644 --- a/src/examples/eo/Makefile.am +++ b/src/examples/eo/Makefile.am @@ -66,7 +66,8 @@ DATA_FILES = Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/eo/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -97,7 +98,3 @@ uninstall-local: for f in $(eo_evas_SOURCES) ; do \ rm -f $(datadir)/eo/examples/evas/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/ephysics/Makefile.am b/src/examples/ephysics/Makefile.am index 58eba94..6b39f0d 100644 --- a/src/examples/ephysics/Makefile.am +++ b/src/examples/ephysics/Makefile.am @@ -75,7 +75,8 @@ EXTRA_DIST = $(SRCS) # test_slider.c \ # test_velocity.c -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/ephysics/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -88,7 +89,3 @@ uninstall-local: for f in $(SRCS) ; do \ rm -f $(datadir)/ephysics/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/ethumb_client/Makefile.am b/src/examples/ethumb_client/Makefile.am index 899a89a..9801a6b 100644 --- a/src/examples/ethumb_client/Makefile.am +++ b/src/examples/ethumb_client/Makefile.am @@ -44,7 +44,8 @@ DATA_FILES = Makefile.examples EXTRA_DIST = $(DATA_FILES) -examples: $(EXTRA_PROGRAMS) +examplesdir = $(libdir)/ethumb_client/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) clean-local: rm -f $(EXTRA_PROGRAMS) @@ -57,7 +58,3 @@ uninstall-local: for f in $(SRCS) $(DATA_FILES); do \ rm -f $(datadir)/ethumb_client/examples/$$f ; \ done - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -endif diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index fd8e552..67b1411 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -319,7 +319,9 @@ im1.png \ cube1.png \ Makefile.examples -examples: $(EXTRA_PROGRAMS) $(EDJS) +examplesdir = $(libdir)/evas/examples +examples_PROGRAMS = $(EXTRA_PROGRAMS) +examples_DATA = $(EDJS) clean-local: rm -f $(EXTRA_PROGRAMS) $(EDJS) @@ -334,8 +336,3 @@ uninstall-local: done EXTRA_DIST = $(EDCS) $(DATA_FILES) - -if ALWAYS_BUILD_EXAMPLES -noinst_PROGRAMS = $(EXTRA_PROGRAMS) -nodist_pkgdata_DATA = $(EDJS) -endif -- 2.7.4