- fix some more PHONY targets

Makefile

@@ -115,8 +115,9 @@ everything: $(shell sed -n 's/^\$$.D.\/\(.*\):.*/\1/p' make/*.mk)
 .print-phony:
 	@echo $(PHONY)
 
-PHONY += everything
+PHONY += local-files
-PHONY += all printenv .print-phony
+PHONY += printenv help done all everything
+PHONY += .print-phony
 .PHONY: $(PHONY)
 
 # this makes sure we do not build top-level dependencies in parallel

make/bootstrap.mk

@@ -105,9 +105,9 @@ host-preqs: pkg-config mkfs.jffs2 mkfs.fat sumtool mkimage zic parted_host mtool
 
 pkg-config-preqs:
 	@PATH=$(subst $(HOST_DIR)/bin:,,$(PATH)); \
-		if ! pkg-config --exists glib-2.0; then \
+	if ! pkg-config --exists glib-2.0; then \
-			echo "pkg-config and glib2-devel packages are needed for building cross-pkg-config."; false; \
+		echo "pkg-config and glib2-devel packages are needed for building cross-pkg-config."; false; \
-		fi
+	fi
 
 pkg-config: $(HOST_DIR)/bin/pkg-config
 $(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONF_VER).tar.gz | $(HOST_DIR)/bin pkg-config-preqs
@@ -229,9 +229,22 @@ $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOST
 	ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext4dev
 	$(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
 
+# -----------------------------------------------------------------------------
+
 # hack to make sure they are always copied
 PHONY += $(TARGET_LIB_DIR)
 PHONY += $(TARGET_LIB_DIR)/firmware
 PHONY += $(TARGET_LIB_DIR)/modules
 PHONY += $(TARGET_DIR)/var/update
-PHONY += ccache includes-and-libs modules targetprefix bootstrap blobs
+
+# -----------------------------------------------------------------------------
+
+PHONY += bootstrap
+PHONY += skeleton
+PHONY += targetprefix
+PHONY += includes-and-libs
+PHONY += modules
+PHONY += blobs
+PHONY += ccache
+PHONY += host-preqs
+PHONY += pkg-config-preqs

make/clean.mk

@@ -20,7 +20,6 @@ all-clean: rebuild-clean staging-clean static-clean
 %-clean:
 	cd $(D) && find . -name $(subst -clean,,$@) -delete
 
-ni-clean \
 clean: rebuild-clean pkg-clean bootstrap
 
 clean-all:
@@ -32,4 +31,13 @@ ccache-clean:
 	@echo "Clearing $$CCACHE_DIR"
 	@$(CCACHE) -C
 
-PHONY += rebuild-clean all-clean pkg-clean
+# -----------------------------------------------------------------------------
+
+PHONY += rebuild-clean
+PHONY += staging-clean
+PHONY += stytic-clean
+PHONY += all-clean
+PHONY += %-clean
+PHONY += clean
+PHONY += clean-all
+PHONY += ccache-clean

make/crosstool.mk

@@ -114,7 +114,7 @@ crosstool-arm-hd51: CROSS_DIR-check
 	rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.20-gdb.py
 	$(REMOVE)/crosstool-ng
 
-PHONY += crosstool $(CROSS_DIR)
+# -----------------------------------------------------------------------------
 
 CROSS_DIR-check:
 ifneq ($(wildcard $(CROSS_DIR)),)
@@ -126,3 +126,11 @@ ifneq ($(wildcard $(CROSS_DIR)),)
 	@echo
 	@false
 endif
+
+# -----------------------------------------------------------------------------
+
+PHONY += crosstool
+PHONY += crosstools
+PHONY += crosstools-renew
+PHONY += $(CROSS_DIR)
+PHONY += CROSS_DIR-check

make/devel-tools.mk

@@ -93,3 +93,7 @@ $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGET_
 	find $(TARGET_DIR)/share/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
 	$(REMOVE)/gdb-$(GDB_VER)
 	$(TOUCH)
+
+# -----------------------------------------------------------------------------
+
+PHONY += valgrind

make/images.mk

@@ -237,3 +237,13 @@ flash-image-arm:
 	tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
 	echo $(IMAGE_URL)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION_STRING) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
+
+# -----------------------------------------------------------------------------
+
+PHONY += devtable
+PHONY += devtable-remove
+PHONY += images
+PHONY += flash-image-cst
+PHONY += check-image-size
+PHONY += flash-image-arm
+PHONY += flash-image-arm-multi

make/neutrino.mk

@@ -216,5 +216,8 @@ libstb-hal-clean:
 libstb-hal-clean-all: libstb-hal-clean
 	-rm -r $(LH_OBJDIR)
 
+# -----------------------------------------------------------------------------
+
+PHONY += neutrino-bin
 PHONY += neutrino-clean neutrino-clean-all
 PHONY += libstb-hal-clean libstb-hal-clean-all

make/ni.mk

@@ -1,6 +1,5 @@
 # custom ni-makefile - just a collection of targets
 
-ni-init \
 init: preqs crosstools bootstrap
 
 # -- wrapper-targets for Neutrino-Updates -------------------------------------
@@ -129,3 +128,15 @@ changelogs:
 		$(call make-changelog) > $(STAGING_DIR)/changelog-neutrino
 	pushd $(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT); \
 		$(call make-changelog) > $(STAGING_DIR)/changelog-libstb-hal
+
+# -----------------------------------------------------------------------------
+
+PHONY += init
+PHONY += ni-neutrino-update
+PHONY += ni-neutrino-updates
+PHONY += ni-neutrino-full-update
+PHONY += ni-neutrino-full-updates
+PHONY += ni-images
+PHONY += personalized-image
+PHONY += ni-image
+PHONY += changelogs

make/rootfs.mk

@@ -201,9 +201,13 @@ personalize: | $(TARGET_DIR)
 	fi
 	$(call local-script,$(notdir $@),stop)
 
+# -----------------------------------------------------------------------------
+
 PHONY += rootfs
 PHONY += .version $(TARGET_DIR)/.version
 PHONY += update.urls $(TARGET_DIR)/var/etc/update.urls
 PHONY += $(BOX)
-PHONY += cleanup strip softlinks
+PHONY += cleanup
+PHONY += strip
+PHONY += softlinks
 PHONY += personalize

make/static.mk

@@ -2,6 +2,8 @@
 
 static: cortex-strings
 
+# -----------------------------------------------------------------------------
+
 CORTEX-STRINGS_CONF =
 ifneq ($(BOXSERIES), hd51)
 	CORTEX-STRINGS_CONF = --without-neon
@@ -29,5 +31,7 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRIN
 	$(REWRITE_LIBTOOL_STATIC)/libcortex-strings.la
 	$(REMOVE)/cortex-strings-$(CORTEX-STRINGS_VER)
 
+# -----------------------------------------------------------------------------
+
 PHONY += static
 PHONY += cortex-strings

make/update.mk

@@ -91,6 +91,8 @@ endif
 	cd $(SOURCE_DIR)/$(NI_RTMPDUMP) && git push
 	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git push
 
+# -----------------------------------------------------------------------------
+
 PHONY += update-self
 PHONY += update-neutrino
 PHONY += update-remotes