make: Use a more consistent rules arg variables names.

Makefile.in

@@ -7,7 +7,6 @@ OBJ := $(abspath $(CURDIR))
 ifeq ($(filter s,$(MAKEFLAGS)),s)
 MAKEFLAGS += --quiet --no-print-directory
 --quiet? := --quiet
-CARGO_BUILD_ARGS := --quiet
 else
 MFLAGS += V=1 VERBOSE=1
 -v? := -v
@@ -52,7 +51,6 @@ else
     MESON_STRIP_ARG := --strip
 endif
 
-CARGO_BUILD_ARGS += --release
 OBJCOPY_FLAGS  := -p
 
 OPTIMIZE_FLAGS := -O2 -march=nocona -mtune=core-avx2 -mfpmath=sse
@@ -424,16 +422,16 @@ WINE_SOURCE_ARGS = \
   --exclude server/request_handlers.h \
   --exclude server/request_trace.h \
 
-WINE_CONFIGURE_ARGS = \
+WINE_AUTOCONF_ARGS = \
   --enable-werror \
   --with-mingw \
   --disable-tests
 
-WINE_CONFIGURE_ARGS32 = \
+WINE_AUTOCONF_ARGS32 = \
   VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST32)/include -I$(VKD3D_DST32)/include/vkd3d" \
   VKD3D_PE_LIBS="-L$(VKD3D_LIBDIR32)/vkd3d/i386-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll"
 
-WINE_CONFIGURE_ARGS64 = --enable-win64 \
+WINE_AUTOCONF_ARGS64 = --enable-win64 \
   VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST64)/include -I$(VKD3D_DST64)/include/vkd3d" \
   VKD3D_PE_LIBS="-L$(VKD3D_LIBDIR64)/vkd3d/x86_64-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll"
 
@@ -544,7 +542,7 @@ VKD3D_SOURCE_ARGS = \
   --exclude m4/ltversion.m4 \
   --exclude m4/lt~obsolete.m4 \
 
-VKD3D_CONFIGURE_ARGS = \
+VKD3D_AUTOCONF_ARGS = \
   --enable-silent-rules \
   --disable-doxygen-doc \
   --disable-tests \

make/rules-autoconf.mk

@@ -21,8 +21,9 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/configure
 	    --libdir="$$($(2)_DST$(3))/lib" \
 	    --host="$$(TARGET_$(4)$(3))" \
 	    $$($(2)_ENV$(3)) \
-	    $$($(2)_CONFIGURE_ARGS) \
+	    $$(AUTOCONF_ARGS_$(3)) \
-	    $$($(2)_CONFIGURE_ARGS$(3))
+	    $$($(2)_AUTOCONF_ARGS) \
+	    $$($(2)_AUTOCONF_ARGS$(3)) \
 
 	touch $$@
 

make/rules-cargo.mk

@@ -13,13 +13,13 @@ $$(OBJ)/.$(1)-configure$(3):
 $$(OBJ)/.$(1)-build$(3):
 	@echo ":: building $(3)bit $(1)..." >&2
 	cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \
-	cargo build \
+	cargo build $(--quiet?) --release \
 	      $$(filter -j%,$$(MAKEFLAGS)) \
-	      --target "$$(CARGO_TARGET_$(3))" \
 	      --target-dir $$($(2)_OBJ$(3)) \
-	      $$(CARGO_BUILD_ARGS) \
+	      $$(CARGO_ARGS_$(3)) \
 	      $$($(2)_CARGO_ARGS) \
-	      $$($(2)_CARGO_ARGS$(3))
+	      $$($(2)_CARGO_ARGS$(3)) \
+
 	touch $$@
 endef
 
@@ -27,3 +27,6 @@ rules-cargo = $(call create-rules-cargo,$(1),$(call toupper,$(1)),$(2))
 
 CARGO_TARGET_32 := i686-unknown-linux-gnu
 CARGO_TARGET_64 := x86_64-unknown-linux-gnu
+
+CARGO_ARGS_32 := --target $(CARGO_TARGET_32)
+CARGO_ARGS_64 := --target $(CARGO_TARGET_64)

make/rules-cmake.mk

@@ -20,8 +20,9 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/CMakeLists.txt
 	    -DCMAKE_SYSTEM_NAME=$(if $(4),Windows,) \
 	    -DCMAKE_SHARED_LIBRARY_PREFIX_C=$(if $(4),,lib) \
 	    -DCMAKE_IMPORT_LIBRARY_PREFIX_C=$(if $(4),,lib) \
+	    $$(CMAKE_ARGS_$(3)) \
 	    $$($(2)_CMAKE_ARGS) \
-	    $$($(2)_CMAKE_ARGS$(3))
+	    $$($(2)_CMAKE_ARGS$(3)) \
 
 	touch $$@
 

make/rules-configure.mk

@@ -13,12 +13,12 @@ $$(OBJ)/.$(1)-configure$(3):
 	cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
 	$$($(2)_SRC)/configure $(--quiet?) \
 	    --cross-prefix=$$(TARGET_$(3))- \
-	    --arch=$(CONFIGURE_ARCH$(3)) \
 	    --target-os=linux \
 	    --prefix="$$($(2)_DST$(3))" \
 	    --libdir="$$($(2)_LIBDIR$(3))/$$(LIBDIR_$(4)$(3))" \
+	    $$(CONFIGURE_ARGS_$(3)) \
 	    $$($(2)_CONFIGURE_ARGS) \
-	    $$($(2)_CONFIGURE_ARGS$(3))
+	    $$($(2)_CONFIGURE_ARGS$(3)) \
 
 	touch $$@
 
@@ -31,7 +31,7 @@ $$(OBJ)/.$(1)-build$(3):
 	touch $$@
 endef
 
-CONFIGURE_ARCH32 = x86
+CONFIGURE_ARGS_32 := --arch=x86
-CONFIGURE_ARCH64 = x86_64
+CONFIGURE_ARGS_64 := --arch=x86_64
 
 rules-configure = $(call create-rules-configure,$(1),$(call toupper,$(1)),$(2),$(3))

make/rules-meson.mk

@@ -52,6 +52,7 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/meson.build
 	      --libdir="lib/$$(LIBDIR_$(4)$(3))" \
 	      --buildtype=plain \
 	      $(if $(4),--cross-file="$$($(2)_OBJ$(3))/cross-$(3).txt",) \
+	      $$(MESON_ARGS_$(3)) \
 	      $$($(2)_MESON_ARGS) \
 	      $$($(2)_MESON_ARGS$(3)) \
 	      $$(MESON_STRIP_ARG)

make/rules-winemaker.mk

@@ -17,9 +17,9 @@ $$(OBJ)/.$(1)-configure$(3):
 	    "-I$$(WINE_SRC)/include/wine" \
 	    "-I$$(WINE_DST$(3))/include/wine" \
 	    $(patsubst %.dll,--dll,$(patsubst %.exe,--guiexe,$(4))) \
+	    $$(WINEMAKER_ARGS_$(3)) \
 	    $$($(2)_WINEMAKER_ARGS) \
 	    $$($(2)_WINEMAKER_ARGS$(3)) \
-	    $(subst --wine64,,--wine$(3)) \
 	    .
 	sed -re 's@_LDFLAGS=@_LDFLAGS= $$$$(LDFLAGS) @' -i "$$($(2)_OBJ$(3))/Makefile"
 	touch $$@
@@ -38,4 +38,7 @@ $$(OBJ)/.$(1)-build$(3):
 	touch $$@
 endef
 
+WINEMAKER_ARGS_32 := --wine32
+WINEMAKER_ARGS_64 :=
+
 rules-winemaker = $(call create-rules-winemaker,$(1),$(call toupper,$(1)),$(2),$(3))