From 920a2e52f0b5d3ee36f7d0cb93a160f1190c3b67 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Tue, 14 Dec 2021 00:46:00 +0300 Subject: [PATCH] makefile: Also pefixup .drv files. --- build/makefile_base.mak | 4 ++-- make/rules-common.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index e28115b7..b33f9d19 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -388,14 +388,14 @@ module32: private SHELL := $(CONTAINER_SHELL) module32: CONTAINERGOALS := $(CONTAINERGOALS) wine-configure32 module32: | all-source wine-configure32 +$(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) $(MFLAGS) $(MAKEOVERRIDES) -C $(WINE_OBJ32)/dlls/$(module) && \ - find $(WINE_OBJ32)/dlls/$(module) -type f -name '*.dll' -printf '%p\0' | \ + find $(WINE_OBJ32)/dlls/$(module) -type f \( -name '*.dll' -o -name '*.drv' \) -printf '%p\0' | \ xargs $(--verbose?) -0 -r -P$(J) -n1 $(SRC)/make/pefixup.py module64: private SHELL := $(CONTAINER_SHELL) module64: CONTAINERGOALS := $(CONTAINERGOALS) wine-configure64 module64: | all-source wine-configure64 +$(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) $(MFLAGS) $(MAKEOVERRIDES) -C $(WINE_OBJ64)/dlls/$(module) && \ - find $(WINE_OBJ64)/dlls/$(module) -type f -name '*.dll' -printf '%p\0' | \ + find $(WINE_OBJ64)/dlls/$(module) -type f \( -name '*.dll' -o -name '*.drv' \) -printf '%p\0' | \ xargs $(--verbose?) -0 -r -P$(J) -n1 $(SRC)/make/pefixup.py module: CONTAINERGOALS := $(CONTAINERGOALS) wine-configure diff --git a/make/rules-common.mk b/make/rules-common.mk index c90315f1..ec083690 100644 --- a/make/rules-common.mk +++ b/make/rules-common.mk @@ -64,7 +64,7 @@ $$(OBJ)/.$(1)-dist$(3): cd $$($(2)_LIBDIR$(3)) && find -type f -not '(' -iname '*.pc' -or -iname '*.cmake' -or -iname '*.a' -or -iname '*.la' -or -iname '*.def' ')' \ -printf '--add-gnu-debuglink=$$(DST_LIBDIR$(3))/%p.debug\0--strip-debug\0%p\0$$(DST_LIBDIR$(3))/%p\0' | \ xargs $(--verbose?) -0 -r -P$$(J) -n4 objcopy --file-alignment=4096 - cd $$($(2)_LIBDIR$(3)) && find -type f -name '*.dll' \ + cd $$($(2)_LIBDIR$(3)) && find -type f \( -name '*.dll' -o -name '*.drv' \) \ -printf '$$(DST_LIBDIR$(3))/%p\0' | \ xargs $(--verbose?) -0 -r -P$$(J) -n1 $$(SRC)/make/pefixup.py touch $$@ @@ -79,7 +79,7 @@ $$(OBJ)/.$(1)-dist$(3): cd $$($(2)_LIBDIR$(3)) && find -type f -not '(' -iname '*.pc' -or -iname '*.cmake' -or -iname '*.a' -or -iname '*.la' -or -iname '*.def' ')' \ -printf '--strip-debug\0%p\0$$(DST_LIBDIR$(3))/%p\0' | \ xargs $(--verbose?) -0 -r -P$$(J) -n3 objcopy --file-alignment=4096 - cd $$($(2)_LIBDIR$(3)) && find -type f -name '*.dll' \ + cd $$($(2)_LIBDIR$(3)) && find -type f \( -name '*.dll' -o -name '*.drv' \) \ -printf '$$(DST_LIBDIR$(3))/%p\0' | \ xargs $(--verbose?) -0 -r -P$$(J) -n1 $$(SRC)/make/pefixup.py touch $$@