Externals/common.mk - Fixed depenency issues

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

diff --git a/Externals/common.mk b/Externals/common.mk
index e74b494..3264a19 100644 (file)
--- a/Externals/common.mk
+++ b/Externals/common.mk
@@ -15,9 +15,11 @@ else
  $(error No BFD translation for $(ARCH) in Externals/common.mk)
 endif
 
-PREFIX=$(ACESSDIR)/Externals/Output/common
-EPREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
-SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(ARCH)
+#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
 
 #
@@ -31,6 +33,7 @@ HOST=$(BFD)-acess_proxy-elf
 # [?]ARCHIVE : Optional forced archive (Defaults to latest)
 # [?]CONFIGURE_LINE : Command to create makefile (defaults to autotools configure)
 # [?]NOBDIR : Set to non-empty to disable use of a separate build dir
+# [?]AUTORECONF : Set to non-empty to regenerate ./configure
 
 
 BTARGETS ?= all
@@ -61,32 +64,45 @@ else
 endif
 SDIR := ../$(DIR)
 
-CONFIGURE_LINE ?= ./configure --host=$(HOST) --prefx=$(PREFIX) --eprefix=$(EPREFIX) $(CONFIGURE_ARGS)
+CONFIGURE_LINE ?= $(SDIR)/configure --host=$(HOST) --prefix=$(PREFIX) --exec-prefix=$(EPREFIX) $(CONFIGURE_ARGS)
 
 .PHONY: all clean install _patch _build
 
+install: all
+       cd $(BDIR) && make $(ITARGETS)
+
 all: $(DIR) _patch _build
 
 clean:
        rm -rf $(DIR) $(BDIR)
 
-install: all
-       cd $(BDIR) && make $(ITARGETS)
-
 $(DIR): $(ARCHIVE)
        tar -xf $(ARCHIVE)
 
 $(DIR)/%: patches/%.patch
        @echo [PATCH] $@
+       @tar -xf $(ARCHIVE) $@
        @patch $@ $<
 
 $(DIR)/%: patches/%
        @echo [CP] $@
+       @mkdir -p $(dir $@)
        @cp $< $@
 
-_patch: $(DIR) $(addprefix $(DIR)/,$(PATCHES))
+PATCHED_FILES := $(addprefix $(DIR)/,$(PATCHES))
+_patch: $(DIR) $(PATCHED_FILES)
+
+CONFIGSCRIPT := $(BDIR)/$(firstword $(CONFIGURE_LINE))
+PATCHED_ACFILES := $(filter %/configure.in %/config.sub, $(PATCHED_FILES))
+$(warning $(CONFIGSCRIPT): $(PATCHED_ACFILES))
+
+$(CONFIGSCRIPT): $(PATCHED_ACFILES)
+ifeq ($(AUTORECONF),)
+else
+       cd $(DIR) && autoreconf --force --install
+endif
 
-$(BDIR)/Makefile: _patch ../common.mk Makefile 
+$(BDIR)/Makefile: _patch $(CONFIGSCRIPT) ../common.mk Makefile 
        mkdir -p $(BDIR)
        cd $(BDIR) && $(CONFIGURE_LINE)