git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Externals/common.mk - Fixed depenency issues
[tpg/acess2.git]
/
Externals
/
common.mk
diff --git
a/Externals/common.mk
b/Externals/common.mk
index
42386e5
..
3264a19
100644
(file)
--- a/
Externals/common.mk
+++ b/
Externals/common.mk
@@
-81,21
+81,28
@@
$(DIR): $(ARCHIVE)
$(DIR)/%: patches/%.patch
@echo [PATCH] $@
$(DIR)/%: patches/%.patch
@echo [PATCH] $@
+ @tar -xf $(ARCHIVE) $@
@patch $@ $<
$(DIR)/%: patches/%
@echo [CP] $@
@patch $@ $<
$(DIR)/%: patches/%
@echo [CP] $@
+ @mkdir -p $(dir $@)
@cp $< $@
@cp $< $@
-_patch: $(DIR) $(addprefix $(DIR)/,$(PATCHES))
+PATCHED_FILES := $(addprefix $(DIR)/,$(PATCHES))
+_patch: $(DIR) $(PATCHED_FILES)
-_autoreconf: _patch
+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
ifeq ($(AUTORECONF),)
else
cd $(DIR) && autoreconf --force --install
endif
-$(BDIR)/Makefile: _
autoreconf
../common.mk Makefile
+$(BDIR)/Makefile: _
patch $(CONFIGSCRIPT)
../common.mk Makefile
mkdir -p $(BDIR)
cd $(BDIR) && $(CONFIGURE_LINE)
mkdir -p $(BDIR)
cd $(BDIR) && $(CONFIGURE_LINE)
UCC
git Repository :: git.ucc.asn.au