From 1e2fd2be0717f5a51943a8ce58c26fdab13305b1 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 24 Jun 2015 13:46:43 +0200 Subject: [PATCH] examples: Fix build after ecore_buffer commit. Since 8b621775619b9959fe952b095b3baaa7aaa99572 make examples fails to build as the examples have been included without checking if ecore_buffer is actually enabled to build. make[2]: *** No rule to make target '../../../src/lib/ecore_buffer/libecore_buffer.la', needed by 'ecore_buffer_example'. Stop. I'm running make examples during the nightlies now in the hope to catch those. --- src/examples/ecore/Makefile.am | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am index 179408e369..3f2c788d80 100644 --- a/src/examples/ecore/Makefile.am +++ b/src/examples/ecore/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/ecore \ --I$(top_srcdir)/src/lib/ecore_buffer \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_input_evas \ -I$(top_srcdir)/src/lib/ecore_file \ @@ -34,11 +33,12 @@ AM_CPPFLAGS = \ -DPACKAGE_EXAMPLES_DIR=\".\" \ @ECORE_CFLAGS@ +if HAVE_ECORE_BUFFER +AM_CPPFLAGS += -I$(top_srcdir)/src/lib/ecore_buffer +endif + EXTRA_PROGRAMS = \ ecore_animator_example \ -ecore_buffer_example \ -ecore_buffer_consumer_example \ -ecore_buffer_provider_example \ ecore_client_bench \ ecore_compose_get_example \ ecore_con_client_example \ @@ -116,6 +116,11 @@ $(ECORE_COMMON_LDADD) ecore_animator_example_SOURCES = ecore_animator_example.c ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) +if HAVE_ECORE_BUFFER +EXTRA_PROGRAMS += ecore_buffer_example \ +ecore_buffer_consumer_example \ +ecore_buffer_provider_example + ecore_buffer_example_SOURCES = ecore_buffer_example.c ecore_buffer_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) \ $(top_builddir)/src/lib/ecore_buffer/libecore_buffer.la @@ -127,6 +132,7 @@ ecore_buffer_consumer_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) \ ecore_buffer_provider_example_SOURCES = ecore_buffer_provider_example.c ecore_buffer_provider_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) \ $(top_builddir)/src/lib/ecore_buffer/libecore_buffer.la +endif ecore_client_bench_SOURCES = ecore_client_bench.c ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD)