aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-05-10 20:32:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-05-10 20:32:22 +0000
commitb1324fcdd336bd704182edf9810fc3c4848cafeb (patch)
treebe8dee63060a5986bb8a09d94effc3ea7ea1750d /package
parent6a7053aa5ccd8ee75c9efb0b87b34836a3720dbe (diff)
downloadupstream-b1324fcdd336bd704182edf9810fc3c4848cafeb.tar.gz
upstream-b1324fcdd336bd704182edf9810fc3c4848cafeb.tar.bz2
upstream-b1324fcdd336bd704182edf9810fc3c4848cafeb.zip
remove old trace/verbose junk
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3755 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile50
-rw-r--r--package/rules.mk39
2 files changed, 16 insertions, 73 deletions
diff --git a/package/Makefile b/package/Makefile
index d213200156..e0bd23c7ec 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -8,53 +8,15 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
compile: $(COMPILE_PACKAGES)
install: base-files-install $(INSTALL_PACKAGES)
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
-
-$(STAMP_DIR):
+$(STAMP_DIR) $(TARGET_DIR):
mkdir -p $@
-$(TARGET_DIR):
- mkdir -p $(TARGET_DIR)
-
%-prepare: $(STAMP_DIR) $(TARGET_DIR)
- @[ -f $(STAMP_DIR)/.$@ ] || { \
- $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
- $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
- touch $(STAMP_DIR)/.$@; \
- $(CMD_TRACE) " done"; \
- $(END_TRACE); \
- } \
- }
-
-%-compile:
- @[ -f $(STAMP_DIR)/.$@ ] || { \
- $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
- $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
- touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
- touch $(STAMP_DIR)/.$@; \
- $(CMD_TRACE) " done"; \
- $(END_TRACE); \
- } \
- }
-
-%-install: %-compile
- @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
- @$(MAKE) -C $(patsubst %-install,%,$@) install
- @$(CMD_TRACE) " done"
- @$(END_TRACE)
+ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-%-rebuild:
- @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
- @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
- $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
- @$(CMD_TRACE) " done"
- @$(END_TRACE)
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+ $(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-clean:
- @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
- @$(MAKE) -C $(patsubst %-clean,%,$@) clean
- @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
- @$(CMD_TRACE) " done"
- @$(END_TRACE)
+%-clean: $(STAMP_DIR) $(TARGET_DIR)
+ $(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/package/rules.mk b/package/rules.mk
index 81bac08b92..540b14f63a 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -164,8 +164,7 @@ endef
ifneq ($(strip $(PKG_SOURCE)),)
$(DL_DIR)/$(PKG_SOURCE):
- @$(CMD_TRACE) "downloading... "
- $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE)
+ $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
endif
@@ -237,42 +236,24 @@ ifneq ($(DUMP),)
dumpinfo:
$(DUMPINFO)
else
+
+$(PACKAGE_DIR):
+ mkdir -p $@
source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: source
- @[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
- $(CMD_TRACE) "preparing... "; \
- $(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
- }
-
-configure: prepare
- @[ -f $(PKG_BUILD_DIR)/.configured ] || { \
- $(CMD_TRACE) "configuring... "; \
- $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
- }
+prepare: $(PKG_BUILD_DIR)/.prepared
+configure: $(PKG_BUILD_DIR)/.configured
compile-targets:
-compile: configure
- @$(CMD_TRACE) "compiling... "
- @$(MAKE) compile-targets $(MAKE_TRACE)
+compile: compile-targets
install-targets:
-install:
- @$(CMD_TRACE) "installing... "
- @$(MAKE) install-targets $(MAKE_TRACE)
-
-rebuild:
- $(CMD_TRACE) "rebuilding... "
- $(MAKE) package-clean compile $(MAKE_TRACE)
-
-$(PACKAGE_DIR):
- mkdir -p $@
+install: install-targets
clean-targets:
clean:
- @$(CMD_TRACE) "cleaning... "
- @$(MAKE) clean-targets $(MAKE_TRACE)
+ @$(MAKE) clean-targets
rm -rf $(PKG_BUILD_DIR)
endif
-.PHONY: all source prepare compile install clean rebuild dumpinfo compile-targets install-targets clean-targets
+.PHONY: all source prepare compile install clean dumpinfo compile-targets install-targets clean-targets