diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 594c28e8..5c664c51 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -669,11 +669,7 @@ $(eval $(call rules-source,wine,$(SRCDIR)/wine)) $(eval $(call rules-autoconf,wine,32)) $(eval $(call rules-autoconf,wine,64)) -$(WINE_SRC)/configure: $(SRCDIR)/wine/configure.ac | $(OBJ)/.wine-source - cd $(WINE_SRC) && autoreconf -fi - touch $@ - -$(OBJ)/.wine-post-source: $(WINE_SRC)/configure +$(OBJ)/.wine-post-source: cd $(WINE_SRC) && tools/make_requests touch $@ diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk index 80eee674..6567f055 100644 --- a/make/rules-autoconf.mk +++ b/make/rules-autoconf.mk @@ -7,7 +7,12 @@ define create-rules-autoconf $(call create-rules-common,$(1),$(2),$(3)) ifeq ($(CONTAINER),1) -$$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/configure.ac +$$(OBJ)/.$(1)-pre-configure: $$($(2)_SRC)/configure.ac + @echo ":: autoreconfing $(1)..." >&2 + cd "$$($(2)_SRC)" && autoreconf -fiv + touch $$@ + +$$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure @echo ":: configuring $(3)bit $(1)..." >&2 rm -rf "$$($(2)_OBJ$(3))/config.cache"