diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-11-27 05:14:37 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-11-27 05:14:37 +0300 |
| commit | d799adc46f07b7a6d6336b7de290367a4a72f339 (patch) | |
| tree | 0abdce1d17d64b1e8d28043aac9546d497dec42e /winsup/w32api/lib/Makefile.in | |
| parent | 1d88f8cea2f22cc8a5dab4db4238481666d50254 (diff) | |
* lib/vfw32.def: Remove, replacing with ...
* lib/msvfw32.def: New file.
* lib/avicap32.def: New file.
* lib/avifil32.def: New file.
* lib/vfw32.mri: New file.
* Makefile.in: (MRI_FILES, MIMPLIBS): New vars for
import libs with multiple dll's.
(LIBS): Add MIMPLIBS.
(DISTFILES): Add MRI_FILES.
(libvfw32.a): Build using mri script.
Diffstat (limited to 'winsup/w32api/lib/Makefile.in')
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index 5d5581213..ad14441f0 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -110,9 +110,11 @@ GL_HEADERS = $(notdir $(wildcard $(srcdir)/../include/GL/*.h)) # libraries DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def)) +MRI_FILES = $(notdir $(wildcard $(srcdir)/*.mri)) IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES))) +MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES))) EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a -LIBS = $(IMPLIBS) $(EXTRA_LIBS) +LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS) UUID_OBJS = uuid.o mshtml-uuid.o EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \ $(UUID_OBJS) dinput.o kernel32.o @@ -120,7 +122,7 @@ UUID_SOURCES = uuid.c mshtml-uuid.c SOURCES = scrnsave.c shell32.c largeint.c dinput.c $(UUID_SOURCES)\ dxguid.c res.rc test.c kernel32.c -DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES) +DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES) .NOTPARALLEL: @@ -166,6 +168,15 @@ libuuid.a : $(UUID_OBJS) $(AR) rc $@ $(UUID_OBJS) $(RANLIB) $@ +# 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. +libvfw32.a : libmsvfw32.a libavifil32.a libavicap32.a vfw32.mri + rm -f $@ + $(AR) -M < vfw32.mri + $(RANLIB) $@ + lib%.a : %.def %.o $(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def $(AR) r $@ $*.o |