diff options
author | Christopher Faylor <me@cgf.cx> | 2003-11-28 02:34:18 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2003-11-28 02:34:18 +0300 |
commit | 8cf11e29184e92373aa3229a3cd07f18a511360f (patch) | |
tree | 56a9980df3f17f9d4784c6b3806713d8eec47bff /winsup | |
parent | 93eba3cb600c4eb06a535d47137e775f4042c456 (diff) |
* lib/Makefile.in: Use make function to locate .mri file to allow building in
directory other than source directory.
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/w32api/lib/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 4b1d024c2..c4a02e716 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2003-11-27 Christopher Faylor <cgf@redhat.com> + + * lib/Makefile.in: Use make function to locate .mri file to allow + building in directory other than source directory. + 2003-11-27 Danny Smith <dannysmith@users.sourceforge.net> * lib/vfw32.def: Remove, replacing with ... diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index ad14441f0..377a60bc6 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 |