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 3b788de..6c23a33 100644 (file)
--- a/Externals/core.mk
+++ b/Externals/core.mk
@@ -5,22 +5,7 @@
 # core.mk
 # - Makefile code used by all externals
 
--include ../../Makefile.cfg
-
-ifeq ($(ARCH),x86)
- BFD := i586
-else ifeq ($(ARCH),x86_64)
- BFD := x86_64
-else
- $(error No BFD translation for $(ARCH) in Externals/common.mk)
-endif
-
-#PREFIX=$(ACESSDIR)/Externals/Output
-#EPREFIX=$(ACESSDIR)/Externals/Output/$(BFD)
-PREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
-EPREFIX=$(PREFIX)
-SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(BFD)
-HOST=$(BFD)-acess_proxy-elf
+include $(dir $(lastword $(MAKEFILE_LIST)))/config.mk
 
 #
 # DEPS : Dependencies for this program/library 
@@ -59,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
@@ -72,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] $@
@@ -92,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)
+