diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index e20d2da0..86b3cacc 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -134,7 +134,7 @@ endef neutrino-plugins: neutrino $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) all DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR) $(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL) $(TOUCH) @@ -162,7 +162,8 @@ neutrino-plugins-clean-all: neutrino-plugins-clean neutrino-plugin-%: $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) all install DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) + $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) install DESTDIR=$(TARGET_DIR) # ----------------------------------------------------------------------------- diff --git a/make/neutrino.mk b/make/neutrino.mk index 485dd1b9..395c7021 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -170,7 +170,7 @@ $(NEUTRINO_BUILD_DIR)/config.status: $(NEUTRINO_DEPS) neutrino: $(NEUTRINO_BUILD_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - $(MAKE) -C $(NEUTRINO_BUILD_DIR) all DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(NEUTRINO_BUILD_DIR) $(MAKE) -C $(NEUTRINO_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR) $(MAKE) $(TARGET_sysconfdir)/init.d/start_neutrino $(TOUCH) @@ -225,7 +225,7 @@ $(LIBSTB-HAL_BUILD_DIR)/config.status: $(LIBSTB-HAL_DEPS) libstb-hal: $(LIBSTB-HAL_BUILD_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - $(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) all DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) $(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR) $(REWRITE_LIBTOOL_LA) $(TOUCH) @@ -238,7 +238,7 @@ ifeq ($(CLEAN),yes) endif $(MAKE) $(NEUTRINO_BUILD_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - $(MAKE) -C $(NEUTRINO_BUILD_DIR) all DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(NEUTRINO_BUILD_DIR) $(INSTALL_EXEC) -D $(NEUTRINO_BUILD_DIR)/src/neutrino $(TARGET_bindir)/neutrino ifneq ($(DEBUG),yes) $(TARGET_STRIP) $(TARGET_bindir)/neutrino diff --git a/make/target-development.mk b/make/target-development.mk index 423a99bd..ed25985a 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -33,7 +33,7 @@ valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) --mandir=$(REMOVE_mandir) \ --datadir=$(REMOVE_datadir) \ ; \ - $(MAKE) all; \ + $(MAKE); \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) rm -f $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) @@ -59,7 +59,7 @@ valgrind12305: | $(TARGET_DIR) --mandir=$(REMOVE_mandir) \ --datadir=$(REMOVE_datadir) \ ; \ - $(MAKE) all; \ + $(MAKE); \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) $(REMOVE)/valgrind @@ -84,7 +84,7 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) --mandir=$(REMOVE_mandir) \ --enable-silent-rules \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -f $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge) $(REMOVE)/$(STRACE_DIR) diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index f34f33a5..8ad8e341 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -25,7 +25,7 @@ libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) --prefix=$(prefix) \ --enable-shared=yes \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -51,7 +51,7 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(call apply_patches,$(BZIP2_PATCH)); \ mv Makefile-libbz2_so Makefile; \ $(MAKE_ENV) \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install PREFIX=$(TARGET_DIR) rm -f $(TARGET_bindir)/bzip2 $(REMOVE)/$(BZIP2_DIR) @@ -81,7 +81,7 @@ fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) --sysconfdir=/etc \ --disable-docs \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -116,7 +116,7 @@ pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) --disable-loongson-mmi \ --disable-docs \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -154,7 +154,7 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) --disable-gl \ --enable-tee \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_bindir)/cairo-sphinx rm -rf $(TARGET_libdir)/cairo/cairo-fdr* @@ -195,7 +195,7 @@ harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) --without-graphite2 \ --without-icu \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) diff --git a/make/target-libs.mk b/make/target-libs.mk index 0ce3beec..e18b7084 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -57,7 +57,7 @@ libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) --enable-lib \ --enable-silent-rules \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -184,7 +184,7 @@ libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) --enable-optimize \ $(LIBCURL_CONF) \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/curl-config $(HOST_DIR)/bin/ $(REWRITE_CONFIG) $(HOST_DIR)/bin/curl-config @@ -222,7 +222,7 @@ libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) --disable-static \ $(LIBPNG_CONF) \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/libpng*-config $(HOST_DIR)/bin/ $(REWRITE_CONFIG) $(HOST_DIR)/bin/libpng16-config @@ -269,7 +269,7 @@ freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) --without-harfbuzz \ --without-bzip2 \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) ln -sf freetype2 $(TARGET_includedir)/freetype mv $(TARGET_bindir)/freetype-config $(HOST_DIR)/bin @@ -1094,7 +1094,7 @@ libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) --enable-fpm=arm \ --enable-sso \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -1122,7 +1122,7 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGE $(CONFIGURE) \ --prefix=$(prefix) \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -1205,7 +1205,7 @@ libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) --datarootdir=$(REMOVE_datarootdir) \ $(LIBFFI_CONF) \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) diff --git a/make/target-lua.mk b/make/target-lua.mk index a7388b5f..1c736b6b 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -181,6 +181,6 @@ luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOUR --enable-silent-rules \ ; \ $(MAKE); \ - $(MAKE) all check install + $(MAKE) install $(REMOVE)/$(LUAPOSIX_DIR) $(TOUCH) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index c0dd5691..d7640b62 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -237,7 +237,7 @@ readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR) --prefix=$(prefix) \ --datarootdir=$(REMOVE_datarootdir) \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(READLINE_DIR) diff --git a/make/target-tools.mk b/make/target-tools.mk index 0372ae2b..f87ad12e 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1222,7 +1222,7 @@ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) --disable-relro \ --disable-swat \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mkdir -p $(TARGET_localstatedir)/samba/locks $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf @@ -1336,7 +1336,7 @@ fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) $(call apply_patches,$(FBSHOT_PATCH)); \ $(SED) 's| gcc | $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \ $(SED) '/strip fbshot/d' Makefile; \ - $(MAKE) all; \ + $(MAKE); \ $(INSTALL_EXEC) -D fbshot $(TARGET_bindir)/fbshot $(REMOVE)/$(FBSHOT_DIR) $(TOUCH) @@ -1369,7 +1369,7 @@ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR) --with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' \ ; \ $(MAKE) vcs_version; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install $(INSTALL_COPY) $(TARGET_FILES)/lcd4linux/* $(TARGET_DIR)/ #$(MAKE) samsunglcd4linux @@ -1635,7 +1635,7 @@ mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) --without-gpm-mouse \ --without-x \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_datadir)/mc/examples find $(TARGET_datadir)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm @@ -1717,7 +1717,7 @@ aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR) --prefix=$(prefix) \ --enable-silent-rules \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/$(AIO-GRAB_DIR) $(TOUCH) @@ -1854,7 +1854,7 @@ flac: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) --disable-ogg \ --disable-sse \ ; \ - $(MAKE) all; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC)