From 043df621505fb501fb61e838c96cb40ef7a825ca Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Wed, 10 May 2006 20:57:35 +0000 Subject: [PATCH] change phony targets to FORCE (easier to read) SVN-Revision: 3757 --- openwrt/Makefile | 13 +++++-------- openwrt/package/rules.mk | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/openwrt/Makefile b/openwrt/Makefile index ec1e3677ab..c323a9c24c 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -38,21 +38,19 @@ endif endif export OPENWRTVERSION -.pkginfo: +.pkginfo: FORCE +ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package) @echo Collecting package info... @-for makefile in package/*/Makefile; do \ echo Source-Makefile: $$makefile; \ $(MAKE) DUMP=1 -f $$makefile 2>&- || true; \ done > $@ - -ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package) -.pkginfo: pkginfo-clean endif .config.in: .pkginfo ./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@ -pkginfo-clean: +pkginfo-clean: FORCE -rm -f .pkginfo .config.in scripts/config/mconf: .config.in @@ -70,6 +68,5 @@ config: scripts/config/conf config-clean: $(MAKE) -C scripts/config clean -.PHONY: pkginfo-clean - - +.PHONY: FORCE +FORCE: diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk index 540b14f63a..3d2f957d3b 100644 --- a/openwrt/package/rules.mk +++ b/openwrt/package/rules.mk @@ -240,20 +240,21 @@ else $(PACKAGE_DIR): mkdir -p $@ -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -configure: $(PKG_BUILD_DIR)/.configured +source: FORCE $(DL_DIR)/$(PKG_SOURCE) +prepare: FORCE $(PKG_BUILD_DIR)/.prepared +configure: FORCE $(PKG_BUILD_DIR)/.configured -compile-targets: -compile: compile-targets +compile-targets: FORCE +compile: FORCE compile-targets -install-targets: -install: install-targets +install-targets: FORCE +install: FORCE install-targets -clean-targets: -clean: +clean-targets: FORCE +clean: FORCE @$(MAKE) clean-targets rm -rf $(PKG_BUILD_DIR) endif -.PHONY: all source prepare compile install clean dumpinfo compile-targets install-targets clean-targets +.PHONY: FORCE +FORCE: -- 2.25.1