cleanup; replace .PHONY with FORCE; disable gdb by default

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3877 3c298f89-4303-0410-b956-a3cf2f4a3e73

19 files changed, 47 insertions, 63 deletions

diff --git a/target/Makefile b/target/Makefile
index 58fc5eb87..709a2080a 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -13,20 +13,20 @@ compile: linux-compile
 install: image_clean linux-install
 clean: linux-clean utils-clean lzma-clean image_clean
 
-image_clean:
+image_clean: FORCE
 	rm -f $(BIN_DIR)/openwrt-*
 
-%-clean:
+%-clean: FORCE
 	$(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-prepare:
+%-prepare: FORCE
 	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
 	$(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-rebuild: 
+%-rebuild: FORCE
 	$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
 	$(MAKE) -C $(patsubst %-install,%,$@) install
-linux-imagebuilder:
+linux-imagebuilder: FORCE
 	$(MAKE) -C linux imagebuilder
 
 
diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile
index 207d95d9a..7775e8888 100644
--- a/target/linux/ar7-2.4/Makefile
+++ b/target/linux/ar7-2.4/Makefile
@@ -60,7 +60,7 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
 
 linux-dirclean: drivers-clean
 
-drivers-clean:
+drivers-clean: FORCE
 	rm -rf $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)
 
 
diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 9447114d4..384a1ea91 100644
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -62,5 +62,5 @@ $(LINUX_DIR)/.drivers-installed: $(LINUX_DIR)/.modules_done
 
 linux-dirclean: drivers-clean
 
-drivers-clean:
+drivers-clean: FORCE
 	rm -rf $(BUILD_DIR)/kernel-binary-wl
diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile
index 3b8234339..a5141cb54 100644
--- a/target/linux/image/Makefile
+++ b/target/linux/image/Makefile
@@ -14,25 +14,23 @@ ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
 include ./tgz.mk
 endif
 
-prepare:
+prepare: FORCE
 	$(MAKE) prepare-targets
-compile:
+compile: FORCE
 	$(MAKE) compile-targets
-install:
+install: FORCE
 	$(MAKE) install-targets
 
-.PHONY: prepare compile install
-
-$(BOARD)-compile:
+$(BOARD)-compile: FORCE
 	$(MAKE) -C $(BOARD) prepare
 	$(MAKE) -C $(BOARD) compile
 
-install-ib:
+install-ib: FORCE
 	-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
 	$(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/	
 
-install-prepare:
+install-prepare: FORCE
 	find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
 	find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755
 	find $(BUILD_DIR)/root -type d | xargs chmod 0755
@@ -40,5 +38,5 @@ install-prepare:
 	chmod 0777 $(BUILD_DIR)/root/tmp
 
 rebuild: clean prepare compile install
-clean:
+clean: FORCE
 	$(MAKE) clean-targets
diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 0ddde2026..7ca076acc 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -12,10 +12,10 @@ LOADER_MAKEOPTS= \
 
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-lzma-loader-clean:
+lzma-loader-clean: FORCE
 	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
 
-lzma-loader-prepare:
+lzma-loader-prepare: FORCE
 	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) prepare
 
 lzma-loader-compile: $(KDIR)/vmlinux.lzma lzma-loader-prepare
diff --git a/target/linux/image/au1000/Makefile b/target/linux/image/au1000/Makefile
index c7158ca76..2c9b1c05d 100644
--- a/target/linux/image/au1000/Makefile
+++ b/target/linux/image/au1000/Makefile
@@ -12,10 +12,10 @@ LOADER_MAKEOPTS= \
 
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-lzma-loader-clean:
+lzma-loader-clean: FORCE
 	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
 
-lzma-loader-prepare:
+lzma-loader-prepare: FORCE
 	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) prepare
 
 lzma-loader-compile: $(KDIR)/vmlinux.lzma lzma-loader-prepare
diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile
index 0fe3ceeac..7e328470a 100644
--- a/target/linux/image/brcm/Makefile
+++ b/target/linux/image/brcm/Makefile
@@ -2,10 +2,10 @@ include $(TOPDIR)/rules.mk
 
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-lzma-loader-clean:
+lzma-loader-clean: FORCE
 	$(MAKE) -C lzma-loader clean
 
-lzma-loader-prepare:
+lzma-loader-prepare: FORCE
 	$(MAKE) -C lzma-loader prepare
 
 lzma-loader-compile: lzma-loader-prepare
diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index 44d892415..c1d07a22b 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -6,13 +6,13 @@ endif
 
 #JFFS2OPTS += -Xlzo -msize -Xlzari
 
-jffs2-prepare:
+jffs2-prepare: FORCE
 	$(MAKE) -C jffs2 prepare
 
 jffs2-compile: prepare-targets
 	$(MAKE) -C jffs2 compile
 
-jffs2-clean:
+jffs2-clean: FORCE
 	$(MAKE) -C jffs2 clean
 	rm -f $(KDIR)/root.jffs2*
 
@@ -28,11 +28,11 @@ ifeq ($(IB),)
 jffs2-install: compile-targets $(BOARD)-compile
 endif
 
-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
+jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB FORCE
 	$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
 	$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
 
-jffs2-install-ib: compile-targets
+jffs2-install-ib: compile-targets FORCE
 	mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
 	$(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
 
diff --git a/target/linux/image/jffs2/Makefile b/target/linux/image/jffs2/Makefile
index 071bacdd4..0273d52fd 100644
--- a/target/linux/image/jffs2/Makefile
+++ b/target/linux/image/jffs2/Makefile
@@ -24,6 +24,6 @@ source: $(DL_DIR)/$(MTD_SOURCE)
 prepare: $(MTD_DIR)/.unpacked
 compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2
 install: 
-clean:
+clean: FORCE
 	rm -rf $(MTD_DIR)
 
diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index abe21563e..184330cfe 100644
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -4,13 +4,13 @@ else
 endian := be
 endif
 
-squashfs-prepare:
+squashfs-prepare: FORCE
 	$(MAKE) -C squashfs prepare
 
 squashfs-compile: prepare-targets
 	$(MAKE) -C squashfs compile
 	
-squashfs-clean:
+squashfs-clean: FORCE
 	$(MAKE) -C squashfs clean
 	rm -f $(KDIR)/root.squashfs
 
@@ -22,7 +22,7 @@ ifeq ($(IB),)
 squashfs-install: compile-targets $(BOARD)-compile
 endif
 
-squashfs-install: $(KDIR)/root.squashfs
+squashfs-install: $(KDIR)/root.squashfs FORCE
 	$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
 
 squashfs-install-ib: compile-targets
diff --git a/target/linux/image/squashfs/Makefile b/target/linux/image/squashfs/Makefile
index b5a51f8a3..a2b367187 100644
--- a/target/linux/image/squashfs/Makefile
+++ b/target/linux/image/squashfs/Makefile
@@ -23,5 +23,5 @@ source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE)
 prepare: $(SQUASHFSLZMA_DIR)/.unpacked
 compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma
 install:
-clean: 
+clean: FORCE
 	rm -rf $(SQUASHFSLZMA_DIR)
diff --git a/target/linux/image/tgz.mk b/target/linux/image/tgz.mk
index 4ea84ebd4..506ab891a 100644
--- a/target/linux/image/tgz.mk
+++ b/target/linux/image/tgz.mk
@@ -1,4 +1,4 @@
-$(KDIR)/root.tar.gz:
+$(KDIR)/root.tar.gz: FORCE
 	tar -zcf $@ --owner=root --group=root -C $(BUILD_DIR)/root/ .
 
 ifeq ($(BOARD),x86)
diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile
index 5820d022b..8035d722f 100644
--- a/target/linux/image/x86/Makefile
+++ b/target/linux/image/x86/Makefile
@@ -4,33 +4,28 @@ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 
 ifeq ($(FS),jffs2-8MB)
-
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS)
 	$(CP) $^ $@
 
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
-
 endif
 
 
 ifeq ($(FS),tgz)
-
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz
 	$(CP) $^ $@
 
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz
-
 endif
 
 
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/bzImage
 	$(CP) $^ $@
 
-
 clean:
 prepare:
 compile:
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
-install-ib:
+install-ib: FORCE
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
 	$(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
diff --git a/target/linux/image/xscale/Makefile b/target/linux/image/xscale/Makefile
index 04a89f9b1..cc47c25ab 100644
--- a/target/linux/image/xscale/Makefile
+++ b/target/linux/image/xscale/Makefile
@@ -2,35 +2,29 @@ include $(TOPDIR)/rules.mk
 
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-
 ifeq ($(FS),jffs2-8MB)
-
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS)
 	$(CP) $^ $@
 
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
-
 endif
 
 
 ifeq ($(FS),tgz)
-
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz
 	$(CP) $^ $@
 
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz
-
 endif
 
 
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/vmlinux
 	$(CP) $^ $@
 
-
 clean:
 prepare:
 compile:
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
-install-ib:
+install-ib: FORCE
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
 	$(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
diff --git a/target/linux/imagebuilder/Makefile b/target/linux/imagebuilder/Makefile
index 4afb4d45a..53e8dfc58 100644
--- a/target/linux/imagebuilder/Makefile
+++ b/target/linux/imagebuilder/Makefile
@@ -21,12 +21,12 @@ endef
 
 include ./kernel.mk
 
-clean:
+clean: FORCE
 	@rm -rf $(LINUX_BUILD_DIR)/root*
 	@rm -rf $(BIN_DIR)
 all:
 
-build:
+build: FORCE
 	echo
 	echo '### BUILDING IMAGE FROM lists/$(LIST).$(BOARD)-$(KERNEL)'
 	echo
diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index fc337543e..346fb7fad 100644
--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -72,7 +72,7 @@ $(BUILD_DIR)/kernel.mk: FORCE
 	echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
 	echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
 
-pkg-install:
+pkg-install: FORCE
 	@{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
 
 source: $(DL_DIR)/$(LINUX_SOURCE)
@@ -84,24 +84,21 @@ compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile $(LINUX_KERNEL)
 
-mostlyclean:
+mostlyclean: FORCE
 	rm -f $(STAMP_DIR)/.linux-compile
 	rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
 	rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
 	$(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
 	rm -f $(LINUX_KERNEL)
 
-rebuild:
+rebuild: FORCE
 	-$(MAKE) mostlyclean
 	if [ -f $(LINUX_KERNEL) ]; then \
 		$(MAKE) clean; \
 	fi
 	$(MAKE) compile $(MAKE_TRACE)
 
-clean:
+clean: FORCE
 	rm -f $(STAMP_DIR)/.linux-compile
 	rm -rf $(LINUX_BUILD_DIR)
 	rm -f $(TARGETS)
-	
-.PHONY: source prepare compile install mostlyclean rebuild clean pkg-install
-
diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index ecaae0a41..a8f01ff5e 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -26,22 +26,22 @@ install: $(patsubst %,%-install,$(package-y))
 
 KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"
 
-%-prepare:
+%-prepare: FORCE
 	$(MAKE) -C $(patsubst %-prepare,%,$@) \
 		$(KPKG_MAKEOPTS) \
 		prepare
 
-%-compile:
+%-compile: FORCE
 	$(MAKE) -C $(patsubst %-compile,%,$@) \
 		$(KPKG_MAKEOPTS) \
 		compile
 
-%-install:
+%-install: FORCE
 	$(MAKE) -C $(patsubst %-install,%,$@) \
 		$(KPKG_MAKEOPTS) \
 		install
 
-%-clean:
+%-clean: FORCE
 	@$(MAKE) -C $(patsubst %-clean,%,$@) \
 		$(KPKG_MAKEOPTS) \
 		clean
diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index d68a5d4b7..b358a9efc 100644
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -36,18 +36,18 @@ lzma: $(TARGETS)
 
 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
 
-lzma-clean:
+lzma-clean: FORCE
 	-$(MAKE) -C $(LZMA_LIB_DIR) clean
 	-$(MAKE) -C $(LZMA_ALONE_DIR) clean
 	rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma
 
-lzma-dirclean:
+lzma-dirclean: FORCE
 	rm -rf $(LZMA_DIR)
 
 #############################################################
 
 prepare: $(LZMA_DIR)/.unpacked
 compile: lzma
-install: lzma
+install: lzma FORCE
 	$(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean
diff --git a/target/utils/Makefile b/target/utils/Makefile
index 5b0f2470b..fe354754c 100644
--- a/target/utils/Makefile
+++ b/target/utils/Makefile
@@ -5,12 +5,12 @@ TARGETS := addpattern trx motorola-bin dgfirmware
 UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils
 
 prepare: $(UTILS_BUILD_DIR)
-compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS))
+compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) FORCE
 	mkdir -p $(STAGING_DIR)/bin
 	$(CP) $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/
 install: compile
 package:
-clean:
+clean: FORCE
 	rm -rf $(UTILS_BUILD_DIR)
 	for f in $(TARGETS); do \
 		rm -f $(STAGING_DIR)/bin/$$f ; \