summaryrefslogtreecommitdiff
path: root/src/Makefile.am
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 /src/Makefile.am
parent63233680c76bc7db0de4fac058581c18e2694a88 (diff)
Revert "build: fix examples dist based on various configure flags"
This reverts commit ded5b1e764fdc97403bd829b02106ae8b9af10a4. this broke build in some cases
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am9
1 files changed, 1 insertions, 8 deletions
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
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