From 2fecc8656f1d0cc41c15c265054ab4a85411df45 Mon Sep 17 00:00:00 2001 From: cgf Date: Thu, 27 Nov 2003 23:34:18 +0000 Subject: [PATCH] * lib/Makefile.in: Use make function to locate .mri file to allow building in directory other than source directory. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/lib/Makefile.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 4b1d024c27..c4a02e716e 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2003-11-27 Christopher Faylor + + * lib/Makefile.in: Use make function to locate .mri file to allow + building in directory other than source directory. + 2003-11-27 Danny Smith * lib/vfw32.def: Remove, replacing with ... diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index ad14441f0c..377a60bc6f 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -172,9 +172,9 @@ libuuid.a : $(UUID_OBJS) # 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. -libvfw32.a : libmsvfw32.a libavifil32.a libavicap32.a vfw32.mri +libvfw32.a : vfw32.mri libmsvfw32.a libavifil32.a libavicap32.a rm -f $@ - $(AR) -M < vfw32.mri + $(AR) -M < ${word 1,$^} $(RANLIB) $@ lib%.a : %.def %.o -- 2.11.0