Signed-off-by: Jacek Caban <ja...@codeweavers.com>
---
mingw-w64-crt/Makefile.am | 27
+++++++--------------------
mingw-w64-crt/lib-common/runtimeobject.mri | 5 +++++
mingw-w64-crt/lib32/runtimeobject.mri | 5 -----
mingw-w64-crt/lib64/runtimeobject.mri | 5 -----
mingw-w64-crt/libarm32/runtimeobject.mri | 5 -----
mingw-w64-crt/libarm64/runtimeobject.mri | 5 -----
6 files changed, 12 insertions(+), 40 deletions(-)
create mode 100644 mingw-w64-crt/lib-common/runtimeobject.mri
delete mode 100644 mingw-w64-crt/lib32/runtimeobject.mri
delete mode 100644 mingw-w64-crt/lib64/runtimeobject.mri
delete mode 100644 mingw-w64-crt/libarm32/runtimeobject.mri
delete mode 100644 mingw-w64-crt/libarm64/runtimeobject.mri
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 30f9f7fc..4986b4ef 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -758,11 +758,6 @@ lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/l
$(AR) -M < $<
$(RANLIB) $@
-lib32/libruntimeobject.a: lib32/runtimeobject.mri lib32/libapi-ms-win-core-winrt-string-l1-1-0.a lib32/libapi-ms-win-core-winrt-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
lib32/libsynchronization.a: lib32/synchronization.mri lib32/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
@@ -1141,11 +1136,6 @@ lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/l
$(AR) -M < $<
$(RANLIB) $@
-lib64/libruntimeobject.a: lib64/runtimeobject.mri lib64/libapi-ms-win-core-winrt-string-l1-1-0.a lib64/libapi-ms-win-core-winrt-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
lib64/libsynchronization.a: lib64/synchronization.mri lib64/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
@@ -1468,11 +1458,6 @@ libarm32/libvfw32.a: libarm32/vfw32.mri libarm32/libmsvfw32.a libarm32/libavifil
$(AR) -M < $<
$(RANLIB) $@
-libarm32/libruntimeobject.a: libarm32/runtimeobject.mri libarm32/libapi-ms-win-core-winrt-string-l1-1-0.a libarm32/libapi-ms-win-core-winrt-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
libarm32/libsynchronization.a: libarm32/synchronization.mri libarm32/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
@@ -1770,11 +1755,6 @@ libarm64/libvfw32.a: libarm64/vfw32.mri libarm64/libmsvfw32.a libarm64/libavifil
$(AR) -M < $<
$(RANLIB) $@
-libarm64/libruntimeobject.a: libarm64/runtimeobject.mri libarm64/libapi-ms-win-core-winrt-string-l1-1-0.a libarm64/libapi-ms-win-core-winrt-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
libarm64/libsynchronization.a: libarm64/synchronization.mri libarm64/libapi-ms-win-core-synch-l1-2-0.a
rm -f $@
$(AR) -M < $<
@@ -1898,6 +1878,13 @@ endif
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
+%/libruntimeobject.a: lib-common/runtimeobject.mri \
+ %/libapi-ms-win-core-winrt-string-l1-1-0.a \
+ %/libapi-ms-win-core-winrt-l1-1-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 > $@
diff --git a/mingw-w64-crt/lib-common/runtimeobject.mri b/mingw-w64-crt/lib-common/runtimeobject.mri
new file mode 100644
index 00000000..5069ae25
--- /dev/null
+++ b/mingw-w64-crt/lib-common/runtimeobject.mri
@@ -0,0 +1,5 @@
+CREATE libruntimeobject.a
+ADDLIB libapi-ms-win-core-winrt-string-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-l1-1-0.a
+SAVE
+END
diff --git a/mingw-w64-crt/lib32/runtimeobject.mri b/mingw-w64-crt/lib32/runtimeobject.mri
deleted file mode 100644
index 8b9a7fd7..00000000
--- a/mingw-w64-crt/lib32/runtimeobject.mri
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE lib32/libruntimeobject.a
-ADDLIB lib32/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-winrt-l1-1-0.a
-SAVE
-END
diff --git a/mingw-w64-crt/lib64/runtimeobject.mri b/mingw-w64-crt/lib64/runtimeobject.mri
deleted file mode 100644
index b34cd42b..00000000
--- a/mingw-w64-crt/lib64/runtimeobject.mri
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE lib64/libruntimeobject.a
-ADDLIB lib64/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-winrt-l1-1-0.a
-SAVE
-END
diff --git a/mingw-w64-crt/libarm32/runtimeobject.mri b/mingw-w64-crt/libarm32/runtimeobject.mri
deleted file mode 100644
index 73c6bceb..00000000
--- a/mingw-w64-crt/libarm32/runtimeobject.mri
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE libarm32/libruntimeobject.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-l1-1-0.a
-SAVE
-END
diff --git a/mingw-w64-crt/libarm64/runtimeobject.mri b/mingw-w64-crt/libarm64/runtimeobject.mri
deleted file mode 100644
index 9f152178..00000000
--- a/mingw-w64-crt/libarm64/runtimeobject.mri
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE libarm64/libruntimeobject.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-l1-1-0.a
-SAVE
-END
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
