summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-07-04 11:49:43 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-07-04 11:49:57 -0400
commit736c5a30632d06f455ba72a4a612aa7977b4961e (patch)
tree4c19cc955db5a6cef0e8db6778d566ebbe053429
parent63233680c76bc7db0de4fac058581c18e2694a88 (diff)
Revert "build: fix examples dist based on various configure flags"
This reverts commit ded5b1e764fdc97403bd829b02106ae8b9af10a4. this broke build in some cases
-rw-r--r--Makefile.am12
-rw-r--r--configure.ac44
-rw-r--r--src/Makefile.am9
3 files changed, 21 insertions, 44 deletions
diff --git a/Makefile.am b/Makefile.am
index a818b4e..939687b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -437,13 +437,7 @@ endif
437EXTRA_DIST += $(systemdunits_DATA) 437EXTRA_DIST += $(systemdunits_DATA)
438 438
439 439
440PHONIES = doc benchmark 440.PHONY: doc benchmark examples install-examples
441
442if ALWAYS_BUILD_EXAMPLES
443PHONIES += examples install-examples
444endif
445
446.PHONY: $(PHONIES)
447 441
448# Documentation 442# Documentation
449 443
@@ -501,13 +495,13 @@ benchmark:
501 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` 495 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
502 496
503# examples 497# examples
504if ALWAYS_BUILD_EXAMPLES 498
505examples: 499examples:
506 @$(MAKE) $(AM_MAKEFLAGS) -C src examples 500 @$(MAKE) $(AM_MAKEFLAGS) -C src examples
507 501
508install-examples: 502install-examples:
509 @$(MAKE) $(AM_MAKEFLAGS) -C src install-examples 503 @$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
510endif 504
511pkgbuild:: 505pkgbuild::
512 @echo "making arch packages" 506 @echo "making arch packages"
513 makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD 507 makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
diff --git a/configure.ac b/configure.ac
index 72c4d6c..4ff1658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5621,32 +5621,6 @@ case "$host_os" in
5621 ;; 5621 ;;
5622esac 5622esac
5623 5623
5624if test "x$want_always_build_examples" = "xyes" ; then
5625 if test "x$have_cxx11" = "xyes" ; then
5626 cxx_examples="src/examples/eina_cxx/Makefile
5627 src/examples/eolian_cxx/Makefile"
5628 fi
5629 if test "x$have_elua" = "xyes" ; then
5630 elua_examples="src/examples/elua/Makefile"
5631 fi
5632 examples_build="src/examples/eina/Makefile
5633 src/examples/eet/Makefile
5634 src/examples/evas/Makefile
5635 src/examples/ecore/Makefile
5636 src/examples/ecore_avahi/Makefile
5637 src/examples/eio/Makefile
5638 src/examples/eldbus/Makefile
5639 src/examples/ephysics/Makefile
5640 src/examples/edje/Makefile
5641 src/examples/emotion/Makefile
5642 src/examples/emile/Makefile
5643 src/examples/ethumb_client/Makefile
5644 src/examples/elocation/Makefile
5645 src/examples/elementary/Makefile
5646 $elua_examples
5647 $cxx_examples"
5648fi
5649
5650AC_CONFIG_FILES([ 5624AC_CONFIG_FILES([
5651Makefile 5625Makefile
5652data/Makefile 5626data/Makefile
@@ -5665,7 +5639,23 @@ src/Makefile
5665src/benchmarks/eina/Makefile 5639src/benchmarks/eina/Makefile
5666src/benchmarks/eo/Makefile 5640src/benchmarks/eo/Makefile
5667src/benchmarks/evas/Makefile 5641src/benchmarks/evas/Makefile
5668$examples_build 5642src/examples/eina/Makefile
5643src/examples/eina_cxx/Makefile
5644src/examples/eet/Makefile
5645src/examples/evas/Makefile
5646src/examples/ecore/Makefile
5647src/examples/ecore_avahi/Makefile
5648src/examples/eio/Makefile
5649src/examples/eldbus/Makefile
5650src/examples/ephysics/Makefile
5651src/examples/edje/Makefile
5652src/examples/emotion/Makefile
5653src/examples/emile/Makefile
5654src/examples/ethumb_client/Makefile
5655src/examples/elua/Makefile
5656src/examples/eolian_cxx/Makefile
5657src/examples/elocation/Makefile
5658src/examples/elementary/Makefile
5669src/lib/eina/eina_config.h 5659src/lib/eina/eina_config.h
5670src/lib/efl/Efl_Config.h 5660src/lib/efl/Efl_Config.h
5671src/lib/elementary/Elementary_Options.h 5661src/lib/elementary/Elementary_Options.h
diff --git a/src/Makefile.am b/src/Makefile.am
index cd79455..cb89e3c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,12 +97,7 @@ endif
97include Makefile_Eolian_Js.am 97include Makefile_Eolian_Js.am
98include Makefile_Efl_Js.am 98include Makefile_Efl_Js.am
99 99
100PHONIES = benchmark 100.PHONY: benchmark examples
101if ALWAYS_BUILD_EXAMPLES
102PHONIES += examples
103endif
104
105.PHONY: $(PHONIES)
106 101
107BENCHMARK_SUBDIRS = \ 102BENCHMARK_SUBDIRS = \
108benchmarks/eina \ 103benchmarks/eina \
@@ -155,7 +150,6 @@ check-build: all
155 @$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) 150 @$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
156endif 151endif
157 152
158if ALWAYS_BUILD_EXAMPLES
159examples: all 153examples: all
160 @for d in $(EXAMPLES_SUBDIRS); do \ 154 @for d in $(EXAMPLES_SUBDIRS); do \
161 echo "Making examples in $$d"; \ 155 echo "Making examples in $$d"; \
@@ -167,7 +161,6 @@ install-examples:
167 echo "Making install-examples in $$d"; \ 161 echo "Making install-examples in $$d"; \
168 $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \ 162 $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
169 done 163 done
170endif
171 164
172dist-hook: 165dist-hook:
173 @mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data 166 @mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data