1 files changed, 39 insertions, 8 deletions
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
 MAINTAINERCLEANFILES = Makefile.in
 BUILT_SOURCES =
-SUBDIRS = . benchmarks examples
+DIST_SUBDIRS =
+SUBDIRS =
 lib_LTLIBRARIES =
 bin_PROGRAMS =
@@ -47,16 +48,46 @@ include Makefile_Ethumb.am
 .PHONY: benchmark examples
-benchmark:
+BENCHMARK_SUBDIRS = \
-        @$(MAKE) $(AM_MAKEFLAGS)
+benchmarks/eina \
-        @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark
+benchmarks/eo
+DIST_SUBDIRS += $(BENCHMARK_SUBDIRS)
-examples: $(lib_LTLIBRARIES) $(bin_PROGRAMS)
+benchmark: all-am
-        @make
+        @for d in $(BENCHMARK_SUBDIRS); do \
-        @$(MAKE) $(AM_MAKEFLAGS) -C examples examples
+           echo "Making benchmark in $$d"; \
+           $(MAKE) $(AM_MAKEFLAGS) -C $$d benchmark; \
+        done
+EXAMPLES_SUBDIRS = \
+examples/eina \
+examples/eo \
+examples/eet \
+examples/evas \
+examples/ecore \
+examples/eio \
+examples/edbus \
+examples/ephysics \
+examples/edje \
+examples/emotion \
+examples/ethumb
+if ALWAYS_BUILD_EXAMPLES
+SUBDIRS += $(EXAMPLES_SUBDIRS)
+else
+DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
+endif
+examples: all-am
+        @for d in $(EXAMPLES_SUBDIRS); do \
+           echo "Making examples in $$d"; \
+           $(MAKE) $(AM_MAKEFLAGS) -C $$d examples; \
+        done
 install-examples:
-        @$(MAKE) $(AM_MAKEFLAGS) -C examples install-examples
+        @for d in $(EXAMPLES_SUBDIRS); do \
+           echo "Making install-examples in $$d"; \
+           $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples; \
+        done
 clean-local:
        rm -rf bin/eet/*.gcno

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
3	MAINTAINERCLEANFILES = Makefile.in	3	MAINTAINERCLEANFILES = Makefile.in
4	BUILT_SOURCES =	4	BUILT_SOURCES =
5		5
6	SUBDIRS = . benchmarks examples	6	DIST_SUBDIRS =
		7	SUBDIRS =
7		8
8	lib_LTLIBRARIES =	9	lib_LTLIBRARIES =
9	bin_PROGRAMS =	10	bin_PROGRAMS =
@@ -47,16 +48,46 @@ include Makefile_Ethumb.am
47		48
48	.PHONY: benchmark examples	49	.PHONY: benchmark examples
49		50
50	benchmark:	51	BENCHMARK_SUBDIRS = \
51	@$(MAKE) $(AM_MAKEFLAGS)	52	benchmarks/eina \
52	@$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark	53	benchmarks/eo
		54	DIST_SUBDIRS += $(BENCHMARK_SUBDIRS)
53		55
54	examples: $(lib_LTLIBRARIES) $(bin_PROGRAMS)	56	benchmark: 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
		62	EXAMPLES_SUBDIRS = \
		63	examples/eina \
		64	examples/eo \
		65	examples/eet \
		66	examples/evas \
		67	examples/ecore \
		68	examples/eio \
		69	examples/edbus \
		70	examples/ephysics \
		71	examples/edje \
		72	examples/emotion \
		73	examples/ethumb
		74	if ALWAYS_BUILD_EXAMPLES
		75	SUBDIRS += $(EXAMPLES_SUBDIRS)
		76	else
		77	DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
		78	endif
		79
		80	examples: 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
58	install-examples:	86	install-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
61	clean-local:	92	clean-local:
62	rm -rf bin/eet/*.gcno	93	rm -rf bin/eet/*.gcno