synchronization.mri: Use common .mri file for all architectures.

This commit is contained in:
Jacek Caban 2018-09-21 19:24:14 +02:00
parent 03ca1a601b
commit a7f2b2b9dc
7 changed files with 16 additions and 56 deletions

View File

@ -758,11 +758,6 @@ lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/l
$(AR) -M < $<
$(RANLIB) $@
lib32/libsynchronization.a: lib32/synchronization.mri lib32/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
$(RANLIB) $@
lib32/libwindowsapp.a: lib32/windowsapp.mri lib32/libapi-ms-win-core-com-l1-1-1.a lib32/libapi-ms-win-core-com-l2-1-1.a lib32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a \
lib32/libapi-ms-win-core-datetime-l1-1-1.a lib32/libapi-ms-win-core-datetime-l1-1-2.a lib32/libapi-ms-win-core-debug-l1-1-1.a \
lib32/libapi-ms-win-core-delayload-l1-1-1.a lib32/libapi-ms-win-core-errorhandling-l1-1-1.a lib32/libapi-ms-win-core-errorhandling-l1-1-3.a \
@ -1136,11 +1131,6 @@ lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/l
$(AR) -M < $<
$(RANLIB) $@
lib64/libsynchronization.a: lib64/synchronization.mri lib64/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
$(RANLIB) $@
lib64/libwindowsapp.a: lib64/windowsapp.mri lib64/libapi-ms-win-core-com-l1-1-1.a lib64/libapi-ms-win-core-com-l2-1-1.a \
lib64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a lib64/libapi-ms-win-core-datetime-l1-1-1.a lib64/libapi-ms-win-core-datetime-l1-1-2.a \
lib64/libapi-ms-win-core-debug-l1-1-1.a lib64/libapi-ms-win-core-delayload-l1-1-1.a lib64/libapi-ms-win-core-errorhandling-l1-1-1.a \
@ -1458,11 +1448,6 @@ libarm32/libvfw32.a: libarm32/vfw32.mri libarm32/libmsvfw32.a libarm32/libavifil
$(AR) -M < $<
$(RANLIB) $@
libarm32/libsynchronization.a: libarm32/synchronization.mri libarm32/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
$(RANLIB) $@
libarm32/libwindowsapp.a: libarm32/windowsapp.mri libarm32/libapi-ms-win-core-com-l1-1-1.a libarm32/libapi-ms-win-core-com-l2-1-1.a \
libarm32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a libarm32/libapi-ms-win-core-datetime-l1-1-1.a libarm32/libapi-ms-win-core-datetime-l1-1-2.a \
libarm32/libapi-ms-win-core-debug-l1-1-1.a libarm32/libapi-ms-win-core-delayload-l1-1-1.a libarm32/libapi-ms-win-core-errorhandling-l1-1-1.a \
@ -1755,11 +1740,6 @@ libarm64/libvfw32.a: libarm64/vfw32.mri libarm64/libmsvfw32.a libarm64/libavifil
$(AR) -M < $<
$(RANLIB) $@
libarm64/libsynchronization.a: libarm64/synchronization.mri libarm64/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
$(RANLIB) $@
libarm64/libwindowsapp.a: libarm64/windowsapp.mri libarm64/libapi-ms-win-core-com-l1-1-1.a libarm64/libapi-ms-win-core-com-l2-1-1.a \
libarm64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a libarm64/libapi-ms-win-core-datetime-l1-1-1.a libarm64/libapi-ms-win-core-datetime-l1-1-2.a \
libarm64/libapi-ms-win-core-debug-l1-1-1.a libarm64/libapi-ms-win-core-delayload-l1-1-1.a libarm64/libapi-ms-win-core-errorhandling-l1-1-1.a \
@ -1885,6 +1865,12 @@ endif
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
%/libsynchronization.a: lib-common/synchronization.mri \
%/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
%.def: %.def.in
$(MKDIR_P) $(@D) && $(CPP) -x c $< -Wp,-w -undef -P -I$(top_srcdir)/def-include > $@

View File

@ -65007,11 +65007,6 @@ _libm_dummy.c:
@LIB32_TRUE@ $(AR) -M < $<
@LIB32_TRUE@ $(RANLIB) $@
@LIB32_TRUE@lib32/libsynchronization.a: lib32/synchronization.mri lib32/libapi-ms-win-core-synch-l1-2-0.a
@LIB32_TRUE@ rm -f $@
@LIB32_TRUE@ $(AR) -M < $<
@LIB32_TRUE@ $(RANLIB) $@
@LIB32_TRUE@lib32/libwindowsapp.a: lib32/windowsapp.mri lib32/libapi-ms-win-core-com-l1-1-1.a lib32/libapi-ms-win-core-com-l2-1-1.a lib32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a \
@LIB32_TRUE@ lib32/libapi-ms-win-core-datetime-l1-1-1.a lib32/libapi-ms-win-core-datetime-l1-1-2.a lib32/libapi-ms-win-core-debug-l1-1-1.a \
@LIB32_TRUE@ lib32/libapi-ms-win-core-delayload-l1-1-1.a lib32/libapi-ms-win-core-errorhandling-l1-1-1.a lib32/libapi-ms-win-core-errorhandling-l1-1-3.a \
@ -65105,11 +65100,6 @@ _libm_dummy.c:
@LIB64_TRUE@ $(AR) -M < $<
@LIB64_TRUE@ $(RANLIB) $@
@LIB64_TRUE@lib64/libsynchronization.a: lib64/synchronization.mri lib64/libapi-ms-win-core-synch-l1-2-0.a
@LIB64_TRUE@ rm -f $@
@LIB64_TRUE@ $(AR) -M < $<
@LIB64_TRUE@ $(RANLIB) $@
@LIB64_TRUE@lib64/libwindowsapp.a: lib64/windowsapp.mri lib64/libapi-ms-win-core-com-l1-1-1.a lib64/libapi-ms-win-core-com-l2-1-1.a \
@LIB64_TRUE@ lib64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a lib64/libapi-ms-win-core-datetime-l1-1-1.a lib64/libapi-ms-win-core-datetime-l1-1-2.a \
@LIB64_TRUE@ lib64/libapi-ms-win-core-debug-l1-1-1.a lib64/libapi-ms-win-core-delayload-l1-1-1.a lib64/libapi-ms-win-core-errorhandling-l1-1-1.a \
@ -65203,11 +65193,6 @@ _libm_dummy.c:
@LIBARM32_TRUE@ $(AR) -M < $<
@LIBARM32_TRUE@ $(RANLIB) $@
@LIBARM32_TRUE@libarm32/libsynchronization.a: libarm32/synchronization.mri libarm32/libapi-ms-win-core-synch-l1-2-0.a
@LIBARM32_TRUE@ rm -f $@
@LIBARM32_TRUE@ $(AR) -M < $<
@LIBARM32_TRUE@ $(RANLIB) $@
@LIBARM32_TRUE@libarm32/libwindowsapp.a: libarm32/windowsapp.mri libarm32/libapi-ms-win-core-com-l1-1-1.a libarm32/libapi-ms-win-core-com-l2-1-1.a \
@LIBARM32_TRUE@ libarm32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a libarm32/libapi-ms-win-core-datetime-l1-1-1.a libarm32/libapi-ms-win-core-datetime-l1-1-2.a \
@LIBARM32_TRUE@ libarm32/libapi-ms-win-core-debug-l1-1-1.a libarm32/libapi-ms-win-core-delayload-l1-1-1.a libarm32/libapi-ms-win-core-errorhandling-l1-1-1.a \
@ -65290,11 +65275,6 @@ _libm_dummy.c:
@LIBARM64_TRUE@ $(AR) -M < $<
@LIBARM64_TRUE@ $(RANLIB) $@
@LIBARM64_TRUE@libarm64/libsynchronization.a: libarm64/synchronization.mri libarm64/libapi-ms-win-core-synch-l1-2-0.a
@LIBARM64_TRUE@ rm -f $@
@LIBARM64_TRUE@ $(AR) -M < $<
@LIBARM64_TRUE@ $(RANLIB) $@
@LIBARM64_TRUE@libarm64/libwindowsapp.a: libarm64/windowsapp.mri libarm64/libapi-ms-win-core-com-l1-1-1.a libarm64/libapi-ms-win-core-com-l2-1-1.a \
@LIBARM64_TRUE@ libarm64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a libarm64/libapi-ms-win-core-datetime-l1-1-1.a libarm64/libapi-ms-win-core-datetime-l1-1-2.a \
@LIBARM64_TRUE@ libarm64/libapi-ms-win-core-debug-l1-1-1.a libarm64/libapi-ms-win-core-delayload-l1-1-1.a libarm64/libapi-ms-win-core-errorhandling-l1-1-1.a \
@ -65415,6 +65395,12 @@ _libm_dummy.c:
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
%/libsynchronization.a: lib-common/synchronization.mri \
%/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
%.def: %.def.in
$(MKDIR_P) $(@D) && $(CPP) -x c $< -Wp,-w -undef -P -I$(top_srcdir)/def-include > $@

View File

@ -0,0 +1,4 @@
CREATE libsynchronization.a
ADDLIB libapi-ms-win-core-synch-l1-2-0.a
SAVE
END

View File

@ -1,4 +0,0 @@
CREATE lib32/libsynchronization.a
ADDLIB lib32/libapi-ms-win-core-synch-l1-2-0.a
SAVE
END

View File

@ -1,4 +0,0 @@
CREATE lib64/libsynchronization.a
ADDLIB lib64/libapi-ms-win-core-synch-l1-2-0.a
SAVE
END

View File

@ -1,4 +0,0 @@
CREATE libarm32/libsynchronization.a
ADDLIB libarm32/libapi-ms-win-core-synch-l1-2-0.a
SAVE
END

View File

@ -1,4 +0,0 @@
CREATE libarm64/libsynchronization.a
ADDLIB libarm64/libapi-ms-win-core-synch-l1-2-0.a
SAVE
END