* lib32/vfw32.mri: Adjust for lib32 subdirectory. * lib32/vfw64.mri: New. * Makefile.am: Generate libvfw32.a using vfw32.mri. * Makefile.in: Regenerate. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4288 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 29e2602..727b86a 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog

@@ -1,3 +1,10 @@
+2011-05-23  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* lib32/vfw32.mri: Adjust for lib32 subdirectory.
+	* lib32/vfw64.mri: New.
+	* Makefile.am: Generate libvfw32.a using vfw32.mri.
+	* Makefile.in: Regenerate.
+
 2011-06-01  Kai Tietz  <kai.tietz@onevision.com>
 
 	Merged from trunk rev. 4186:

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 0fc8b6b..8265e4b 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am

@@ -405,7 +405,7 @@
   \
   lib32/libcrtdll.a    lib32/libmsvcrt.a    lib32/libmsvcr80.a   \
   \
-  lib32/libpdh.a       lib32/libpdhui.a     \
+  lib32/libpdh.a       lib32/libpdhui.a     lib32/libvfw32.a     \
   lib32/libks.a        \
   lib32/libwinscard.a  \
   lib32/libauthz.a     \
@@ -449,6 +449,15 @@
 lib32/lib%.a: lib32/%.def
 	$(DTDEF32) $<
 
+# libvfw32.a contains import stubs for 3 dll's.  Using an MRI script
+# seems to be the simplest way to combine them into one archive.
+# NB: With older dlltool, the object file members will not have unique
+# names.
+lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/libavicap32.a
+	rm -f $@
+	$(AR) -M < $<
+	$(RANLIB) $@
+
 lib32/libxinput.a: lib32/$(xinput).def
 	$(DTDEF32) $<
 lib32/libxaudio.a: lib32/$(xaudio).def
@@ -832,6 +841,7 @@
   \
   lib64/libcrtdll.a     lib64/libmsvcrt.a     lib64/libmsvcr80.a     \
   \
+  lib64/libvfw32.a      \
   lib64/libks.a         lib64/libndis.a       \
   \
   lib64/libd3dcompiler_33.a lib64/libd3dcompiler_34.a lib64/libd3dcompiler_35.a \
@@ -871,6 +881,15 @@
 lib64/lib%.a: lib64/%.def
 	$(DTDEF64) $<
 
+# libvfw32.a contains import stubs for 3 dll's.  Using an MRI script
+# seems to be the simplest way to combine them into one archive.
+# NB: With older dlltool, the object file members will not have unique
+# names.
+lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/libavicap32.a
+	rm -f $@
+	$(AR) -M < $<
+	$(RANLIB) $@
+
 lib64/libxinput.a: lib64/$(xinput).def
 	$(DTDEF64) $<
 lib64/libxaudio.a: lib64/$(xaudio).def

diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 2186b07..4d360c3 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in

@@ -2580,7 +2580,7 @@
 @LIB32_TRUE@  \
 @LIB32_TRUE@  lib32/libcrtdll.a    lib32/libmsvcrt.a    lib32/libmsvcr80.a   \
 @LIB32_TRUE@  \
-@LIB32_TRUE@  lib32/libpdh.a       lib32/libpdhui.a     \
+@LIB32_TRUE@  lib32/libpdh.a       lib32/libpdhui.a     lib32/libvfw32.a     \
 @LIB32_TRUE@  lib32/libks.a        \
 @LIB32_TRUE@  lib32/libwinscard.a  \
 @LIB32_TRUE@  lib32/libauthz.a     \
@@ -2920,6 +2920,7 @@
 @LIB64_TRUE@  \
 @LIB64_TRUE@  lib64/libcrtdll.a     lib64/libmsvcrt.a     lib64/libmsvcr80.a     \
 @LIB64_TRUE@  \
+@LIB64_TRUE@  lib64/libvfw32.a      \
 @LIB64_TRUE@  lib64/libks.a         lib64/libndis.a       \
 @LIB64_TRUE@  \
 @LIB64_TRUE@  lib64/libd3dcompiler_33.a lib64/libd3dcompiler_34.a lib64/libd3dcompiler_35.a \
@@ -26170,6 +26171,15 @@
 @LIB32_TRUE@lib32/lib%.a: lib32/%.def
 @LIB32_TRUE@	$(DTDEF32) $<
 
+# libvfw32.a contains import stubs for 3 dll's.  Using an MRI script
+# seems to be the simplest way to combine them into one archive.
+# NB: With older dlltool, the object file members will not have unique
+# names.
+@LIB32_TRUE@lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/libavicap32.a
+@LIB32_TRUE@	rm -f $@
+@LIB32_TRUE@	$(AR) -M < $<
+@LIB32_TRUE@	$(RANLIB) $@
+
 @LIB32_TRUE@lib32/libxinput.a: lib32/$(xinput).def
 @LIB32_TRUE@	$(DTDEF32) $<
 @LIB32_TRUE@lib32/libxaudio.a: lib32/$(xaudio).def
@@ -26219,6 +26229,15 @@
 @LIB64_TRUE@lib64/lib%.a: lib64/%.def
 @LIB64_TRUE@	$(DTDEF64) $<
 
+# libvfw32.a contains import stubs for 3 dll's.  Using an MRI script
+# seems to be the simplest way to combine them into one archive.
+# NB: With older dlltool, the object file members will not have unique
+# names.
+@LIB64_TRUE@lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/libavicap32.a
+@LIB64_TRUE@	rm -f $@
+@LIB64_TRUE@	$(AR) -M < $<
+@LIB64_TRUE@	$(RANLIB) $@
+
 @LIB64_TRUE@lib64/libxinput.a: lib64/$(xinput).def
 @LIB64_TRUE@	$(DTDEF64) $<
 @LIB64_TRUE@lib64/libxaudio.a: lib64/$(xaudio).def

diff --git a/mingw-w64-crt/lib32/vfw32.mri b/mingw-w64-crt/lib32/vfw32.mri
index ee01b12..ccce758 100644
--- a/mingw-w64-crt/lib32/vfw32.mri
+++ b/mingw-w64-crt/lib32/vfw32.mri

@@ -1,6 +1,6 @@
-CREATE libvfw32.a
-ADDLIB libmsvfw32.a
-ADDLIB libavicap32.a
-ADDLIB libavifil32.a
+CREATE lib32/libvfw32.a
+ADDLIB lib32/libmsvfw32.a
+ADDLIB lib32/libavicap32.a
+ADDLIB lib32/libavifil32.a
 SAVE
 END

diff --git a/mingw-w64-crt/lib64/vfw32.mri b/mingw-w64-crt/lib64/vfw32.mri
new file mode 100644
index 0000000..9aa07f9
--- /dev/null
+++ b/mingw-w64-crt/lib64/vfw32.mri

@@ -0,0 +1,6 @@
+CREATE lib64/libvfw32.a
+ADDLIB lib64/libmsvfw32.a
+ADDLIB lib64/libavicap32.a
+ADDLIB lib64/libavifil32.a
+SAVE
+END