From b31230313711d14968c81f30b2440f8000e109e9 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Mon, 29 Oct 2012 22:02:25 +0000 Subject: [PATCH] edbus: Use a "make examples" rule to make examples Instead of having to enable the examples during configure time, separate the examples in a special target, "make examples". It's currently a bit different from the libraries in the common efl tree since we are not using recursive makefiles. SVN revision: 78622 --- legacy/edbus/Makefile.am | 9 +++++---- legacy/edbus/configure.ac | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/legacy/edbus/Makefile.am b/legacy/edbus/Makefile.am index 71558e4366..e75d08010c 100644 --- a/legacy/edbus/Makefile.am +++ b/legacy/edbus/Makefile.am @@ -83,8 +83,7 @@ libedbus2_la_SOURCES = \ src/lib/edbus_message_to_eina_value.c \ src/lib/edbus_message_from_eina_value.c -if EFL_BUILD_EXAMPLES -noinst_PROGRAMS = \ +EXAMPLES = \ src/examples/connman-list-services \ src/examples/ofono-dial \ src/examples/banshee \ @@ -97,6 +96,8 @@ noinst_PROGRAMS = \ EXAMPLES_LIBS = libedbus2.la @ECORE_LIBS@ +EXTRA_PROGRAMS = $(EXAMPLES) + src_examples_connman_list_services_SOURCES = \ src/examples/connman-list-services.c src_examples_connman_list_services_LDADD = $(EXAMPLES_LIBS) @@ -125,9 +126,9 @@ src_examples_simple_signal_emit_LDADD = $(EXAMPLES_LIBS) src_examples_complex_types_client_eina_value_SOURCES = src/examples/complex_types_client_eina_value.c src_examples_complex_types_client_eina_value_LDADD = $(EXAMPLES_LIBS) -endif +.PHONY: doc examples -.PHONY: doc +examples: $(EXAMPLES) # Documentation diff --git a/legacy/edbus/configure.ac b/legacy/edbus/configure.ac index 3fde42418e..e203746353 100644 --- a/legacy/edbus/configure.ac +++ b/legacy/edbus/configure.ac @@ -79,9 +79,6 @@ PKG_CHECK_MODULES([EINA], [eina >= 1.7.0]) PKG_CHECK_MODULES([ECORE], [ecore]) PKG_CHECK_MODULES([DBUS], [dbus-1]) -### Build and install examples -EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) - with_max_log_level="EINA_LOG_LEVEL_DBG" AC_ARG_WITH(maximum-log-level, [AC_HELP_STRING([--with-maximum-log-level=NUMBER],