summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-20 17:46:44 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-08-03 13:47:25 +0200
commit39682bc48376122493193059f71d45318b53dbf2 (patch)
treeeb8af0702e69394c7efe21824b5e02b01497afdd
parent310d6d972dbe9f323dd3783158608687b52b6bca (diff)
build: remove BUILT_SOURCES usage from cxx examples makefiles
ref T7154 Differential Revision: https://phab.enlightenment.org/D6656
-rw-r--r--src/examples/Makefile.am2
-rw-r--r--src/examples/eolian_cxx.mk34
2 files changed, 27 insertions, 9 deletions
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index f2e2b4f54e..e987a44e59 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,7 +1,6 @@
1AUTOMAKE_OPTIONS= -Wno-portability 1AUTOMAKE_OPTIONS= -Wno-portability
2CLEANFILES = 2CLEANFILES =
3DISTCLEANFILES = 3DISTCLEANFILES =
4BUILT_SOURCES =
5MAINTAINERCLEANFILES = Makefile.in 4MAINTAINERCLEANFILES = Makefile.in
6EXTRA_PROGRAMS = 5EXTRA_PROGRAMS =
7DATA_FILES = 6DATA_FILES =
@@ -267,7 +266,6 @@ $(top_builddir)/src/bin/edje_cc$(EXEEXT):
267 266
268EXTRA_DIST += $(EDCS) $(DATA_FILES) 267EXTRA_DIST += $(EDCS) $(DATA_FILES)
269EDJS = $(EDCS:%.edc=%.edj) 268EDJS = $(EDCS:%.edc=%.edj)
270CLEANFILES += $(BUILT_SOURCES)
271 269
272examples: $(EXTRA_PROGRAMS) $(EDJS) 270examples: $(EXTRA_PROGRAMS) $(EDJS)
273 271
diff --git a/src/examples/eolian_cxx.mk b/src/examples/eolian_cxx.mk
index aa14652188..589c8b5104 100644
--- a/src/examples/eolian_cxx.mk
+++ b/src/examples/eolian_cxx.mk
@@ -1,9 +1,3 @@
1EOL_CXX_IMPL = \
2eolian_cxx/colourable.c \
3eolian_cxx/colourable_cxx.cc \
4eolian_cxx/colourablesquare.c \
5eolian_cxx/colourablesquare_cxx.cc
6
7EOL_CXX_SRCS = \ 1EOL_CXX_SRCS = \
8eolian_cxx/eolian_cxx_simple_01.cc \ 2eolian_cxx/eolian_cxx_simple_01.cc \
9eolian_cxx/eolian_cxx_callbacks_01.cc \ 3eolian_cxx/eolian_cxx_callbacks_01.cc \
@@ -23,7 +17,7 @@ eolian_cxx/ns_colourablesquare.eo.h \
23eolian_cxx/ns_colourablesquare.eo.hh \ 17eolian_cxx/ns_colourablesquare.eo.hh \
24eolian_cxx/ns_colourablesquare.eo.impl.hh 18eolian_cxx/ns_colourablesquare.eo.impl.hh
25 19
26BUILT_SOURCES += $(EOL_CXX_GENERATED) 20DISTCLEANFILES += $(EOL_CXX_GENERATED)
27 21
28EXTRA_PROGRAMS += \ 22EXTRA_PROGRAMS += \
29eolian_cxx_eolian_cxx_simple_01 \ 23eolian_cxx_eolian_cxx_simple_01 \
@@ -56,6 +50,32 @@ eolian_cxx_eolian_cxx_callbacks_01_CPPFLAGS = \
56$(AM_CPPFLAGS) \ 50$(AM_CPPFLAGS) \
57-I$(top_builddir)/src/examples/eolian_cxx 51-I$(top_builddir)/src/examples/eolian_cxx
58 52
53if HAVE_AM_16
54eolian_cxx/eolian_cxx_simple_01-eolian_cxx_simple_01.$(OBJEXT): $(EOL_CXX_GENERATED)
55eolian_cxx/eolian_cxx_simple_01-colourable.$(OBJEXT): $(EOL_CXX_GENERATED)
56eolian_cxx/eolian_cxx_simple_01-colourablesquare.$(OBJEXT): $(EOL_CXX_GENERATED)
57
58eolian_cxx/eolian_cxx_simple_01_cxx_impl-eolian_cxx_simple_01.$(OBJEXT): $(EOL_CXX_GENERATED)
59eolian_cxx/eolian_cxx_simple_01_cxx_impl-colourable.$(OBJEXT): $(EOL_CXX_GENERATED)
60eolian_cxx/eolian_cxx_simple_01_cxx_impl-colourable_cxx.$(OBJEXT): $(EOL_CXX_GENERATED)
61eolian_cxx/eolian_cxx_simple_01_cxx_impl-colourablesquare.$(OBJEXT): $(EOL_CXX_GENERATED)
62eolian_cxx/eolian_cxx_simple_01_cxx_impl-colourablesquare_cxx.$(OBJEXT): $(EOL_CXX_GENERATED)
63
64eolian_cxx/eolian_cxx_callbacks_01-eolian_cxx_callbacks_01.$(OBJEXT): $(EOL_CXX_GENERATED)
65else
66eolian_cxx/eolian_cxx_eolian_cxx_simple_01-eolian_cxx_simple_01.$(OBJEXT): $(EOL_CXX_GENERATED)
67eolian_cxx/eolian_cxx_eolian_cxx_simple_01-colourable.$(OBJEXT): $(EOL_CXX_GENERATED)
68eolian_cxx/eolian_cxx_eolian_cxx_simple_01-colourablesquare.$(OBJEXT): $(EOL_CXX_GENERATED)
69
70eolian_cxx/eolian_cxx_eolian_cxx_simple_01_cxx_impl-eolian_cxx_simple_01.$(OBJEXT): $(EOL_CXX_GENERATED)
71eolian_cxx/eolian_cxx_eolian_cxx_simple_01_cxx_impl-colourable.$(OBJEXT): $(EOL_CXX_GENERATED)
72eolian_cxx/eolian_cxx_eolian_cxx_simple_01_cxx_impl-colourable_cxx.$(OBJEXT): $(EOL_CXX_GENERATED)
73eolian_cxx/eolian_cxx_eolian_cxx_simple_01_cxx_impl-colourablesquare.$(OBJEXT): $(EOL_CXX_GENERATED)
74eolian_cxx/eolian_cxx_eolian_cxx_simple_01_cxx_impl-colourablesquare_cxx.$(OBJEXT): $(EOL_CXX_GENERATED)
75
76eolian_cxx/eolian_cxx_eolian_cxx_callbacks_01-eolian_cxx_callbacks_01.$(OBJEXT): $(EOL_CXX_GENERATED)
77endif
78
59endif 79endif
60 80
61EOL_CXX_DATA_FILES = eolian_cxx/Makefile.examples $(ECXX_EXAMPLE_EOS) $(EOL_CXX_SRCS) 81EOL_CXX_DATA_FILES = eolian_cxx/Makefile.examples $(ECXX_EXAMPLE_EOS) $(EOL_CXX_SRCS)