From 24edc620d8b0cb69610dade6f69443c364e0da70 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 10 Jul 2012 19:08:01 +0300 Subject: [PATCH] prep optimization There was some extra duplication, just clean it up. --- features.in/build-distro/lib/90-build-distro.mk | 2 +- features.in/build-ve/lib/90-build-ve.mk | 2 -- features.in/build-vm/lib/90-build-vm.mk | 2 -- image.in/Makefile | 2 ++ 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/features.in/build-distro/lib/90-build-distro.mk b/features.in/build-distro/lib/90-build-distro.mk index dddf1f96..9c485d32 100644 --- a/features.in/build-distro/lib/90-build-distro.mk +++ b/features.in/build-distro/lib/90-build-distro.mk @@ -22,7 +22,7 @@ MKI_SORTFILE := /tmp/isosort all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \ postprocess $(GLOBAL_CLEAN_WORKDIR) -prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) imagedir +prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) dot-disk: @mkdir -p files/.disk diff --git a/features.in/build-ve/lib/90-build-ve.mk b/features.in/build-ve/lib/90-build-ve.mk index a221ec5b..504296df 100644 --- a/features.in/build-ve/lib/90-build-ve.mk +++ b/features.in/build-ve/lib/90-build-ve.mk @@ -15,5 +15,3 @@ IMAGE_PACKAGES = $(call list,$(BASE_LISTS)) \ all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \ postprocess $(GLOBAL_CLEAN_WORKDIR) - -prep: imagedir diff --git a/features.in/build-vm/lib/90-build-vm.mk b/features.in/build-vm/lib/90-build-vm.mk index 603c92eb..25ed8ee7 100644 --- a/features.in/build-vm/lib/90-build-vm.mk +++ b/features.in/build-vm/lib/90-build-vm.mk @@ -50,5 +50,3 @@ pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL) all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \ convert-image postprocess $(GLOBAL_CLEAN_WORKDIR) - -prep: imagedir diff --git a/image.in/Makefile b/image.in/Makefile index cc3b0356..795ab251 100644 --- a/image.in/Makefile +++ b/image.in/Makefile @@ -68,6 +68,8 @@ save-profile: .PHONY: imagedir postprocess debug +prep: imagedir + imagedir: @mkdir -p "$(IMAGE_OUTDIR)"