discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=736c5a30632d06f455ba72a4a612aa7977b4961e
commit 736c5a30632d06f455ba72a4a612aa7977b4961e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Tue Jul 4 11:49:43 2017 -0400
Revert "build: fix examples dist based on various configure flags"
This reverts commit ded5b1e764fdc97403bd829b02106ae8b9af10a4.
this broke build in some cases
---
Makefile.am | 12 +++---------
configure.ac | 44 +++++++++++++++++---------------------------
src/Makefile.am | 9 +--------
3 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a818b4e353..939687bfda 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -437,13 +437,7 @@ endif
EXTRA_DIST += $(systemdunits_DATA)
-PHONIES = doc benchmark
-
-if ALWAYS_BUILD_EXAMPLES
-PHONIES += examples install-examples
-endif
-
-.PHONY: $(PHONIES)
+.PHONY: doc benchmark examples install-examples
# Documentation
@@ -501,13 +495,13 @@ benchmark:
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
# examples
-if ALWAYS_BUILD_EXAMPLES
+
examples:
@$(MAKE) $(AM_MAKEFLAGS) -C src examples
install-examples:
@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
-endif
+
pkgbuild::
@echo "making arch packages"
makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
diff --git a/configure.ac b/configure.ac
index 72c4d6c78b..4ff16581eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5621,32 +5621,6 @@ case "$host_os" in
;;
esac
-if test "x$want_always_build_examples" = "xyes" ; then
- if test "x$have_cxx11" = "xyes" ; then
- cxx_examples="src/examples/eina_cxx/Makefile
- src/examples/eolian_cxx/Makefile"
- fi
- if test "x$have_elua" = "xyes" ; then
- elua_examples="src/examples/elua/Makefile"
- fi
- examples_build="src/examples/eina/Makefile
- src/examples/eet/Makefile
- src/examples/evas/Makefile
- src/examples/ecore/Makefile
- src/examples/ecore_avahi/Makefile
- src/examples/eio/Makefile
- src/examples/eldbus/Makefile
- src/examples/ephysics/Makefile
- src/examples/edje/Makefile
- src/examples/emotion/Makefile
- src/examples/emile/Makefile
- src/examples/ethumb_client/Makefile
- src/examples/elocation/Makefile
- src/examples/elementary/Makefile
- $elua_examples
- $cxx_examples"
-fi
-
AC_CONFIG_FILES([
Makefile
data/Makefile
@@ -5665,7 +5639,23 @@ src/Makefile
src/benchmarks/eina/Makefile
src/benchmarks/eo/Makefile
src/benchmarks/evas/Makefile
-$examples_build
+src/examples/eina/Makefile
+src/examples/eina_cxx/Makefile
+src/examples/eet/Makefile
+src/examples/evas/Makefile
+src/examples/ecore/Makefile
+src/examples/ecore_avahi/Makefile
+src/examples/eio/Makefile
+src/examples/eldbus/Makefile
+src/examples/ephysics/Makefile
+src/examples/edje/Makefile
+src/examples/emotion/Makefile
+src/examples/emile/Makefile
+src/examples/ethumb_client/Makefile
+src/examples/elua/Makefile
+src/examples/eolian_cxx/Makefile
+src/examples/elocation/Makefile
+src/examples/elementary/Makefile
src/lib/eina/eina_config.h
src/lib/efl/Efl_Config.h
src/lib/elementary/Elementary_Options.h
diff --git a/src/Makefile.am b/src/Makefile.am
index cd794557ee..cb89e3cacd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,12 +97,7 @@ endif
include Makefile_Eolian_Js.am
include Makefile_Efl_Js.am
-PHONIES = benchmark
-if ALWAYS_BUILD_EXAMPLES
-PHONIES += examples
-endif
-
-.PHONY: $(PHONIES)
+.PHONY: benchmark examples
BENCHMARK_SUBDIRS = \
benchmarks/eina \
@@ -155,7 +150,6 @@ check-build: all
@$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
endif
-if ALWAYS_BUILD_EXAMPLES
examples: all
@for d in $(EXAMPLES_SUBDIRS); do \
echo "Making examples in $$d"; \
@@ -167,7 +161,6 @@ install-examples:
echo "Making install-examples in $$d"; \
$(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
done
-endif
dist-hook:
@mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data
--
