From c5879dab4d0a1e6d0b6e0510e28ddd933ec207fb Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 25 Feb 2015 14:05:42 +0100 Subject: [PATCH] build: Unify use of $(MKDIR_P) for creating a dir within the build system While we used different variation of mkdir -p all over we also had spots where we did not use the option. This is one step in trying to make our build system ready for parallel install. Using something like -j 10 even for the install should help to speed up our jenkins jobs as well as distcheck. --- Makefile.am | 4 ++-- data/Makefile.am | 2 +- doc/Makefile.am | 2 +- doc/previews/Makefile.am | 4 ++-- src/Makefile_Ecore_X.am | 2 +- src/Makefile_Edje.am | 2 +- src/Makefile_Emotion.am | 2 +- src/Makefile_Ethumb.am | 2 +- src/examples/ecore/Makefile.am | 2 +- src/examples/ecore_avahi/Makefile.am | 2 +- src/examples/edje/Makefile.am | 2 +- src/examples/eet/Makefile.am | 2 +- src/examples/eina/Makefile.am | 2 +- src/examples/eina_cxx/Makefile.am | 2 +- src/examples/eio/Makefile.am | 2 +- src/examples/eldbus/Makefile.am | 2 +- src/examples/elocation/Makefile.am | 2 +- src/examples/elua/Makefile.am | 2 +- src/examples/emotion/Makefile.am | 2 +- src/examples/eo/Makefile.am | 8 ++++---- src/examples/eolian_cxx/Makefile.am | 2 +- src/examples/ephysics/Makefile.am | 2 +- src/examples/ethumb_client/Makefile.am | 2 +- src/examples/evas/Makefile.am | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2b00391aac..77b9c01681 100644 --- a/Makefile.am +++ b/Makefile.am @@ -399,7 +399,7 @@ lcov-reset: @lcov --zerocounters --directory $(top_builddir) lcov-report: - @mkdir $(top_builddir)/coverage + $(MKDIR_P) $(top_builddir)/coverage lcov --capture --compat-libtool --no-external --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir) --base-directory $(top_srcdir)/src/ lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info lcov --remove $(top_builddir)/coverage/coverage.cleaned.info '*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info @@ -425,7 +425,7 @@ endif benchmark: @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark - @mkdir benchmark || true + $(MKDIR_P) benchmark @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` # examples diff --git a/data/Makefile.am b/data/Makefile.am index 59d37ef426..77ff99d9ca 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -98,7 +98,7 @@ ethumbframes_DATA = ethumb/frames/default.edj CLEANFILES += ethumb/frames/default.edj ethumb/frames/default.edj: ethumb/frames/default.edc - @$(mkdir_p) ethumb/frames/ + $(MKDIR_P) ethumb/frames/ $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/ethumb/frames/ $< $@ diff --git a/doc/Makefile.am b/doc/Makefile.am index 06712a98eb..2765bb18ef 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -22,7 +22,7 @@ doc: all previews-build previews-data cp $(srcdir)/img/* html/ cp $(srcdir)/img/*.eps latex/ rm -rf $(PACKAGE_DOCNAME).tar* - mkdir -p $(PACKAGE_DOCNAME)/doc + $(MKDIR_P) $(PACKAGE_DOCNAME)/doc cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ bzip2 -9 $(PACKAGE_DOCNAME).tar diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am index 230365634d..e00f5ee159 100644 --- a/doc/previews/Makefile.am +++ b/doc/previews/Makefile.am @@ -44,8 +44,8 @@ PREVIEWS = blend blur bump curve grow mask transform \ example_1 padding previews-data: preview_text_filter - $(mkdir_p) $(DATADIR) - $(mkdir_p) $(HTMLDIR) + $(MKDIR_P) $(DATADIR) + $(MKDIR_P) $(HTMLDIR) @for a in $(PREVIEWS) ; do \ echo " GEN filter_$${a}.png" ; \ FONT="Sans" ; \ diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index 43c06478b2..190bde36e0 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -130,7 +130,7 @@ BUILT_SOURCES += \ $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) utils/ecore/makekeys$(EXEEXT) - $(mkdir_p) $(top_builddir)/src/lib/ecore_x/xcb + $(MKDIR_P) $(top_builddir)/src/lib/ecore_x/xcb $(top_builddir)/src/utils/ecore/makekeys $(KEYSYMDEFS) > $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h mv -f $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h endif diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 3492e6b45e..c7086d6580 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -265,7 +265,7 @@ tests_edje_edje_suite_LDADD = @CHECK_LIBS@ $(USE_EDJE_BIN_LIBS) tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ tests/edje/data/%.edj: tests/edje/data/%.edc bin/edje/edje_cc${EXEEXT} - @$(mkdir_p) tests/edje/data + $(MKDIR_P) tests/edje/data $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/edje/data $< $@ EDJE_DATA_FILES = tests/edje/data/test_layout.edc \ diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am index 1b51d0f996..6b16cb93cc 100644 --- a/src/Makefile_Emotion.am +++ b/src/Makefile_Emotion.am @@ -215,7 +215,7 @@ tests_emotion_emotion_test_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@ tests_emotion_emotion_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ @USE_EMOTION_INTERNAL_LIBS@ tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc${EXEEXT} - @$(mkdir_p) tests/emotion/data + $(MKDIR_P) tests/emotion/data $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@ emotiondatafilesdir = $(datadir)/emotion/data diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am index b0a32f4caa..2a6fac6b37 100644 --- a/src/Makefile_Ethumb.am +++ b/src/Makefile_Ethumb.am @@ -49,7 +49,7 @@ modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules/ethumb/emotion/placeholder.png bin/edje/edje_cc${EXEEXT} - @$(mkdir_p) modules/ethumb/emotion + $(MKDIR_P) modules/ethumb/emotion $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/modules/ethumb/emotion $< $@ ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am index ac2926b813..176ae03a34 100644 --- a/src/examples/ecore/Makefile.am +++ b/src/examples/ecore/Makefile.am @@ -288,7 +288,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/ecore/examples + $(MKDIR_P) $(datadir)/ecore/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ecore/examples uninstall-local: diff --git a/src/examples/ecore_avahi/Makefile.am b/src/examples/ecore_avahi/Makefile.am index 8ce9469cac..fc4b5814c5 100644 --- a/src/examples/ecore_avahi/Makefile.am +++ b/src/examples/ecore_avahi/Makefile.am @@ -36,7 +36,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/ecore_avahi/examples + $(MKDIR_P) $(datadir)/ecore_avahi/examples $(install_sh_DATA) -c $(srcdir)/ecore_avahi_browse_example.c $(datadir)/ecore_avahi/examples $(install_sh_DATA) -c $(srcdir)/ecore_avahi_example.c $(datadir)/ecore_avahi/examples diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am index cfdcc5f9cf..3755a4d636 100644 --- a/src/examples/edje/Makefile.am +++ b/src/examples/edje/Makefile.am @@ -201,7 +201,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) $(EDJS) $(CODEGEN_GENERATED) install-examples: $(EDJS) - mkdir -p $(datadir)/edje/examples + $(MKDIR_P) $(datadir)/edje/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples cd $(builddir) && $(install_sh_DATA) -c $(EDJS) $(datadir)/edje/examples diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am index 8095a3de02..bd5eb7838d 100644 --- a/src/examples/eet/Makefile.am +++ b/src/examples/eet/Makefile.am @@ -50,7 +50,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/eet/examples + $(MKDIR_P) $(datadir)/eet/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eet/examples uninstall-local: diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am index 227dba90b1..1677b600e8 100644 --- a/src/examples/eina/Makefile.am +++ b/src/examples/eina/Makefile.am @@ -152,7 +152,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/eina/examples + $(MKDIR_P) $(datadir)/eina/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eina/examples uninstall-local: diff --git a/src/examples/eina_cxx/Makefile.am b/src/examples/eina_cxx/Makefile.am index a98a82ba89..939d879be7 100644 --- a/src/examples/eina_cxx/Makefile.am +++ b/src/examples/eina_cxx/Makefile.am @@ -29,7 +29,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/eina_cxx/examples + $(MKDIR_P) $(datadir)/eina_cxx/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eina_cxx/examples uninstall-local: diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am index ea34e81384..50d6dbc108 100644 --- a/src/examples/eio/Makefile.am +++ b/src/examples/eio/Makefile.am @@ -49,7 +49,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/eio/examples + $(MKDIR_P) $(datadir)/eio/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eio/examples uninstall-local: diff --git a/src/examples/eldbus/Makefile.am b/src/examples/eldbus/Makefile.am index 6cb4da0686..d820f1d275 100644 --- a/src/examples/eldbus/Makefile.am +++ b/src/examples/eldbus/Makefile.am @@ -83,7 +83,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/eldbus/examples + $(MKDIR_P) $(datadir)/eldbus/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eldbus/examples uninstall-local: diff --git a/src/examples/elocation/Makefile.am b/src/examples/elocation/Makefile.am index 3c843f8b6e..f9688da8df 100644 --- a/src/examples/elocation/Makefile.am +++ b/src/examples/elocation/Makefile.am @@ -38,7 +38,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/elocation/examples + $(MKDIR_P) $(datadir)/elocation/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/elocation/examples uninstall-local: diff --git a/src/examples/elua/Makefile.am b/src/examples/elua/Makefile.am index ebf088af83..6dea8c6471 100644 --- a/src/examples/elua/Makefile.am +++ b/src/examples/elua/Makefile.am @@ -10,7 +10,7 @@ examples: ; clean-local: ; #install-examples: -# mkdir -p $(datadir)/elua/examples +# $(MKDIR_P) $(datadir)/elua/examples # cd $(srcdir) && $(install_sh_DATA) -c $(DATA_FILES) $(datadir)/elua/examples #uninstall-local: diff --git a/src/examples/emotion/Makefile.am b/src/examples/emotion/Makefile.am index 8d5d9591b9..15bde92e49 100644 --- a/src/examples/emotion/Makefile.am +++ b/src/examples/emotion/Makefile.am @@ -49,7 +49,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/emotion/examples + $(MKDIR_P) $(datadir)/emotion/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/emotion/examples uninstall-local: diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am index 5d3c0e7936..9bd1a926f8 100644 --- a/src/examples/eo/Makefile.am +++ b/src/examples/eo/Makefile.am @@ -72,15 +72,15 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/eo/examples - mkdir -p $(datadir)/eo/examples/isa - mkdir -p $(datadir)/eo/examples/simple + $(MKDIR_P) $(datadir)/eo/examples + $(MKDIR_P) $(datadir)/eo/examples/isa + $(MKDIR_P) $(datadir)/eo/examples/simple cd $(srcdir); \ $(install_sh_DATA) -c $(DATA_FILES) $(datadir)/eo/examples; \ $(install_sh_DATA) -c $(eo_isa_SOURCES) $(datadir)/eo/examples/isa; \ $(install_sh_DATA) -c $(eo_simple_SOURCES) $(datadir)/eo/examples/simple; if EO_BUILD_EXAMPLE_EVAS - mkdir -p $(datadir)/eo/examples/evas + $(MKDIR_P) $(datadir)/eo/examples/evas cd $(srcdir) && $(install_sh_DATA) -c $(eo_evas_SOURCES) $(datadir)/eo/examples/evas endif diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am index a434aa5eca..2b9cf913e3 100644 --- a/src/examples/eolian_cxx/Makefile.am +++ b/src/examples/eolian_cxx/Makefile.am @@ -143,7 +143,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) $(GENERATED) install-examples: - mkdir -p $(datadir)/eolian_cxx/examples + $(MKDIR_P) $(datadir)/eolian_cxx/examples cd $(abs_srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eolian_cxx/examples uninstall-local: diff --git a/src/examples/ephysics/Makefile.am b/src/examples/ephysics/Makefile.am index 58eba947fd..fe9bd51394 100644 --- a/src/examples/ephysics/Makefile.am +++ b/src/examples/ephysics/Makefile.am @@ -81,7 +81,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/ephysics/examples + $(MKDIR_P) $(datadir)/ephysics/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(datadir)/ephysics/examples uninstall-local: diff --git a/src/examples/ethumb_client/Makefile.am b/src/examples/ethumb_client/Makefile.am index 899a89af47..86f0a20200 100644 --- a/src/examples/ethumb_client/Makefile.am +++ b/src/examples/ethumb_client/Makefile.am @@ -50,7 +50,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) install-examples: - mkdir -p $(datadir)/ethumb_client/examples + $(MKDIR_P) $(datadir)/ethumb_client/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ethumb_client/examples uninstall-local: diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index 6985705428..fee3fac601 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -378,7 +378,7 @@ clean-local: rm -f $(EXTRA_PROGRAMS) $(EDJS) install-examples: - mkdir -p $(datadir)/evas/examples + $(MKDIR_P) $(datadir)/evas/examples cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/evas/examples uninstall-local: