X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2FMakefile;h=153ca657b0283b20dd105297e2150489d9bea8c0;hp=e94b90d4a117546105e798502715141f4784d173;hb=4d530c69b329dea2face807e6d74292c35a3b12d;hpb=196ad55bd2bdad8c5c86249afd4b1cec04855d35 diff --git a/package/Makefile b/package/Makefile index e94b90d4a..153ca657b 100644 --- a/package/Makefile +++ b/package/Makefile @@ -14,13 +14,12 @@ $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) $(curdir)/builddirs-install:=. $(sort $(package-y)) -$(curdir)//compile = $(1)/prepare -$(curdir)//install = $(1)/compile $(curdir)/install:=$(curdir)/install-cleanup -$(curdir)/install-cleanup: + +$(curdir)/cleanup: rm -rf $(BUILD_DIR)/root - $(MAKE) install-targets - $(MAKE) preconfig + +$(curdir)/rootfs-prepare: @if [ -d $(TOPDIR)/files ]; then \ $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ fi @@ -35,16 +34,19 @@ $(curdir)/install-cleanup: @-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf @-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f - -$(curdir)/index: FORCE - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) + @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) $(curdir)/flags-install:= -j1 $(eval $(call stampfile,$(curdir),package,prereq)) +$(eval $(call stampfile,$(curdir),package,cleanup)) $(eval $(call stampfile,$(curdir),package,compile)) $(eval $(call stampfile,$(curdir),package,install)) +$(eval $(call stampfile,$(curdir),package,rootfs-prepare)) -$($(curdir)/stamp-install): $($(curdir)/stamp-compile) +$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build +$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build +$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build +$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build $(eval $(call subdir,$(curdir)))