Merge branch 'master' of git://cadel.mutabah.net/acess2

[tpg/acess2.git] / Externals / core.mk

diff --git a/Externals/core.mk b/Externals/core.mk
index 56d4050..6c23a33 100644 (file)
--- a/Externals/core.mk
+++ b/Externals/core.mk
@@ -44,7 +44,7 @@ endif
 DIR := $(patsubst $(TARBALL_TO_DIR_L),$(TARBALL_TO_DIR_R),$(ARCHIVE))
 
 ifeq ($(NOBDIR),)
- BDIR := build-$(DIR)
+ BDIR := build-$(ARCH)
 else
  BDIR := $(DIR)
 endif
@@ -57,14 +57,9 @@ all: $(DIR) _patch _build
 clean:
        rm -rf $(DIR) $(BDIR)
 
-$(DIR): $(ARCHIVE) patches/UNIFIED.patch
+$(DIR): $(ARCHIVE)
        tar -xf $(ARCHIVE)
-ifneq ($(wildcard patches/UNIFIED.patch),)
-       cd $(DIR) && patch -p1 < ../patches/UNIFIED.patch
-endif
 
-patches/UNIFIED.patch:
-       
 
 $(DIR)/%: patches/%.patch
        @echo [PATCH] $@
@@ -77,4 +72,15 @@ $(DIR)/%: patches/%
        @cp $< $@
 
 PATCHED_FILES := $(addprefix $(DIR)/,$(PATCHES))
-_patch: $(DIR) $(PATCHED_FILES)
+
+ifneq ($(wildcard patches/UNIFIED.patch),)
+$(DIR)/_unified_applied: $(wildcard patches/UNIFIED.patch)
+       cd $(DIR) && patch -p1 < ../patches/UNIFIED.patch
+       touch $@
+UNIFIED_TARGET=$(DIR)/_unified_applied
+else
+UNIFIED_TARGET=
+endif
+
+_patch: $(DIR) $(PATCHED_FILES) $(UNIFIED_TARGET)
+