merge: use $(MAKE) $(AM_MAKEFLAGS) and not just make. Fix benchmark-e17 rule

SVN revision: 77008
devs/devilhorns/wayland_egl
Vincent Torri 11 years ago
parent 9de9bccb9a
commit a05d6a0419
  1. 21
      Makefile.am
  2. 12
      src/Makefile.am
  3. 4
      src/benchmarks/Makefile.am
  4. 4
      src/benchmarks/eina/Makefile.am
  5. 8
      src/examples/Makefile.am

@ -67,7 +67,7 @@ pkgconfig_DATA += eina.pc eet.pc
doc:
@echo "entering doc/"
make -C doc doc
$(MAKE) $(AM_MAKEFLAGS) -C doc doc
# Unit tests
@ -91,11 +91,12 @@ if EFL_ENABLE_TESTS
check-local:
if EFL_ENABLE_COVERAGE
@$(MAKE) lcov-reset
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
endif
@./src/tests/eet/eet_suite
@./src/tests/eina/eina_suite$(EXEEXT)
@./src/tests/eet/eet_suite$(EXEEXT)
if EFL_ENABLE_COVERAGE
@$(MAKE) lcov-report
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
endif
endif
@ -103,22 +104,22 @@ endif
# benchmark
benchmark:
@$(MAKE) -C src benchmark
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
@mkdir benchmark || true
@cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s`
@cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s`
benchmark-e17:
@$(MAKE) -C src benchmark-e17
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17
@mkdir benchmark || true
@cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s`
@cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s`
# examples
examples:
@$(MAKE) -C src examples
@$(MAKE) $(AM_MAKEFLAGS) -C src examples
install-examples:
@$(MAKE) -C src install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
# cleaning

@ -5,16 +5,16 @@ SUBDIRS = lib include modules bin scripts benchmarks tests examples
.PHONY: benchmark benchmark-e17 examples
benchmark:
@make -C lib
@$(MAKE) -C benchmarks benchmark
@$(MAKE) $(AM_MAKEFLAGS) -C lib
@$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark
benchmark-e17:
@make -C lib
@$(MAKE) -C benchmarks benchmark-e17
@$(MAKE) $(AM_MAKEFLAGS) -C lib
@$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark-e17
examples:
@make -C lib
@$(MAKE) -C examples examples
@$(MAKE) $(AM_MAKEFLAGS) -C examples examples
install-examples:
@$(MAKE) -C examples install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C examples install-examples

@ -5,7 +5,7 @@ SUBDIRS = eina
.PHONY: benchmark benchmark-e17
benchmark:
@$(MAKE) -C eina benchmark
@$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
benchmark-e17:
@$(MAKE) -C eina benchmark-e17
@$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17

@ -12,8 +12,8 @@ EXTRA_PROGRAMS = eina_bench
benchmark: eina_bench libcity.la
#benchmark-e17: eina_bench
# AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17
benchmark-e17: eina_bench
@$(MAKE) $(AM_MAKEFLAGS) AM_CPPFLAGS="${AM_CPPFLAGS} -DEINA_ENABLE_BENCH_E17"
eina_bench_SOURCES = \
eina_bench.c \

@ -3,9 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = eina eet
examples:
@$(MAKE) -C eina examples
@$(MAKE) -C eet examples
@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
install-examples:
@$(MAKE) -C eina install-examples
@$(MAKE) -C eet install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples

Loading…
Cancel
Save