summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 07:38:26 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 07:38:26 +0000
commit3815810b1ac136023982b548e48070a70f486f04 (patch)
tree0996587a1474b6cb8af42d670d135cf3dbbc5765
parent730bc88271a9ad877e75f071d9a506f552114e71 (diff)
clean up benchmark and example rules.
- they have no 'all' rule, keep out of SUBDIRS - they depend on 'all-am', the non-recursive target that builds everything. - they do not need a directory on its own to declare nothing.x SVN revision: 82689
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am47
-rw-r--r--src/benchmarks/Makefile.am9
-rw-r--r--src/examples/Makefile.am15
4 files changed, 39 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac
index a8c6c96..ec27616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3471,10 +3471,8 @@ data/Makefile
3471doc/Makefile 3471doc/Makefile
3472doc/Doxyfile 3472doc/Doxyfile
3473src/Makefile 3473src/Makefile
3474src/benchmarks/Makefile
3475src/benchmarks/eina/Makefile 3474src/benchmarks/eina/Makefile
3476src/benchmarks/eo/Makefile 3475src/benchmarks/eo/Makefile
3477src/examples/Makefile
3478src/examples/eina/Makefile 3476src/examples/eina/Makefile
3479src/examples/eet/Makefile 3477src/examples/eet/Makefile
3480src/examples/eo/Makefile 3478src/examples/eo/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ad8b97..bc218e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,8 @@ AUTOMAKE_OPTIONS = subdir-objects
3MAINTAINERCLEANFILES = Makefile.in 3MAINTAINERCLEANFILES = Makefile.in
4BUILT_SOURCES = 4BUILT_SOURCES =
5 5
6SUBDIRS = . benchmarks examples 6DIST_SUBDIRS =
7SUBDIRS =
7 8
8lib_LTLIBRARIES = 9lib_LTLIBRARIES =
9bin_PROGRAMS = 10bin_PROGRAMS =
@@ -47,16 +48,46 @@ include Makefile_Ethumb.am
47 48
48.PHONY: benchmark examples 49.PHONY: benchmark examples
49 50
50benchmark: 51BENCHMARK_SUBDIRS = \
51 @$(MAKE) $(AM_MAKEFLAGS) 52benchmarks/eina \
52 @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark 53benchmarks/eo
54DIST_SUBDIRS += $(BENCHMARK_SUBDIRS)
53 55
54examples: $(lib_LTLIBRARIES) $(bin_PROGRAMS) 56benchmark: all-am
55 @make 57 @for d in $(BENCHMARK_SUBDIRS); do \
56 @$(MAKE) $(AM_MAKEFLAGS) -C examples examples 58 echo "Making benchmark in $$d"; \
59 $(MAKE) $(AM_MAKEFLAGS) -C $$d benchmark; \
60 done
61
62EXAMPLES_SUBDIRS = \
63examples/eina \
64examples/eo \
65examples/eet \
66examples/evas \
67examples/ecore \
68examples/eio \
69examples/edbus \
70examples/ephysics \
71examples/edje \
72examples/emotion \
73examples/ethumb
74if ALWAYS_BUILD_EXAMPLES
75SUBDIRS += $(EXAMPLES_SUBDIRS)
76else
77DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
78endif
79
80examples: all-am
81 @for d in $(EXAMPLES_SUBDIRS); do \
82 echo "Making examples in $$d"; \
83 $(MAKE) $(AM_MAKEFLAGS) -C $$d examples; \
84 done
57 85
58install-examples: 86install-examples:
59 @$(MAKE) $(AM_MAKEFLAGS) -C examples install-examples 87 @for d in $(EXAMPLES_SUBDIRS); do \
88 echo "Making install-examples in $$d"; \
89 $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples; \
90 done
60 91
61clean-local: 92clean-local:
62 rm -rf bin/eet/*.gcno 93 rm -rf bin/eet/*.gcno
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
deleted file mode 100644
index b57b13e..0000000
--- a/src/benchmarks/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3SUBDIRS = eina eo
4
5.PHONY: benchmark
6
7benchmark:
8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
9 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
deleted file mode 100644
index dc4d9e6..0000000
--- a/src/examples/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3SUBDIRS = eina eo eet evas ecore eio edbus ephysics edje emotion ethumb
4
5.PHONY: examples install-examples
6
7examples:
8 @for d in $(SUBDIRS); do \
9 $(MAKE) $(AM_MAKEFLAGS) -C "$$d" examples || exit 0; \
10 done
11
12install-examples:
13 @for d in $(SUBDIRS); do \
14 $(MAKE) $(AM_MAKEFLAGS) -C "$$d" install-examples || exit 0; \
15 done