From 34fa35dc99a5292b4f020ea79755bb765ee29294 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 9 May 2005 14:42:30 +0000 Subject: [PATCH] Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. --- dlls/Makedll.rules.in | 51 +++++++++++++++++++++++++++++++++++++---------- dlls/Makefile.in | 9 +++------ dlls/advapi32/Makefile.in | 1 + dlls/advpack/Makefile.in | 1 + dlls/amstream/Makefile.in | 1 + dlls/atl/Makefile.in | 1 + dlls/avicap32/Makefile.in | 1 + dlls/avifil32/Makefile.in | 1 + dlls/cabinet/Makefile.in | 1 + dlls/capi2032/Makefile.in | 1 + dlls/cards/Makefile.in | 1 + dlls/cfgmgr32/Makefile.in | 1 + dlls/comcat/Makefile.in | 1 + dlls/comctl32/Makefile.in | 1 + dlls/commdlg/Makefile.in | 1 + dlls/crtdll/Makefile.in | 1 + dlls/crypt32/Makefile.in | 1 + dlls/cryptdll/Makefile.in | 1 + dlls/ctl3d/Makefile.in | 1 + dlls/d3d8/Makefile.in | 1 + dlls/d3d9/Makefile.in | 1 + dlls/d3dim/Makefile.in | 2 +- dlls/d3drm/Makefile.in | 1 + dlls/d3dx8/Makefile.in | 1 + dlls/d3dxof/Makefile.in | 1 + dlls/dbghelp/Makefile.in | 1 + dlls/dciman32/Makefile.in | 1 + dlls/ddraw/Makefile.in | 1 + dlls/devenum/Makefile.in | 1 + dlls/dinput/Makefile.in | 3 +++ dlls/dinput8/Makefile.in | 1 + dlls/dmband/Makefile.in | 1 + dlls/dmcompos/Makefile.in | 1 + dlls/dmime/Makefile.in | 1 + dlls/dmloader/Makefile.in | 1 + dlls/dmscript/Makefile.in | 1 + dlls/dmstyle/Makefile.in | 1 + dlls/dmsynth/Makefile.in | 1 + dlls/dmusic/Makefile.in | 1 + dlls/dmusic32/Makefile.in | 1 + dlls/dplay/Makefile.in | 1 + dlls/dplayx/Makefile.in | 1 + dlls/dpnet/Makefile.in | 1 + dlls/dpnhpast/Makefile.in | 1 + dlls/dsound/Makefile.in | 1 + dlls/dswave/Makefile.in | 1 + dlls/dxdiagn/Makefile.in | 1 + dlls/gdi/Makefile.in | 1 + dlls/glu32/Makefile.in | 1 + dlls/glut32/Makefile.in | 1 + dlls/iccvid/Makefile.in | 1 + dlls/icmp/Makefile.in | 1 + dlls/imagehlp/Makefile.in | 1 + dlls/imm32/Makefile.in | 1 + dlls/iphlpapi/Makefile.in | 1 + dlls/itss/Makefile.in | 1 + dlls/kernel/Makefile.in | 1 + dlls/lzexpand/Makefile.in | 1 + dlls/make_dlls | 9 +++------ dlls/mapi32/Makefile.in | 1 + dlls/mlang/Makefile.in | 1 + dlls/mpr/Makefile.in | 1 + dlls/msacm/Makefile.in | 1 + dlls/mscms/Makefile.in | 1 + dlls/msdmo/Makefile.in | 1 + dlls/mshtml/Makefile.in | 1 + dlls/msi/Makefile.in | 1 + dlls/msimg32/Makefile.in | 1 + dlls/msnet32/Makefile.in | 1 + dlls/msrle32/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt20/Makefile.in | 1 + dlls/msvcrt40/Makefile.in | 1 + dlls/msvcrtd/Makefile.in | 1 + dlls/msvidc32/Makefile.in | 1 + dlls/msvideo/Makefile.in | 1 + dlls/mswsock/Makefile.in | 1 + dlls/netapi32/Makefile.in | 1 + dlls/newdev/Makefile.in | 1 + dlls/ntdll/Makefile.in | 1 + dlls/odbc32/Makefile.in | 1 + dlls/ole32/Makefile.in | 1 + dlls/oleacc/Makefile.in | 1 + dlls/oleaut32/Makefile.in | 1 + dlls/olecli/Makefile.in | 1 + dlls/oledlg/Makefile.in | 1 + dlls/olepro32/Makefile.in | 1 + dlls/olesvr/Makefile.in | 1 + dlls/opengl32/Makefile.in | 1 + dlls/powrprof/Makefile.in | 1 + dlls/psapi/Makefile.in | 1 + dlls/qcap/Makefile.in | 1 + dlls/quartz/Makefile.in | 1 + dlls/rasapi32/Makefile.in | 1 + dlls/riched20/Makefile.in | 1 + dlls/richedit/Makefile.in | 1 + dlls/rpcrt4/Makefile.in | 1 + dlls/rsabase/Makefile.in | 1 + dlls/rsaenh/Makefile.in | 1 + dlls/secur32/Makefile.in | 1 + dlls/sensapi/Makefile.in | 1 + dlls/serialui/Makefile.in | 1 + dlls/setupapi/Makefile.in | 1 + dlls/shdocvw/Makefile.in | 1 + dlls/shell32/Makefile.in | 1 + dlls/shfolder/Makefile.in | 2 +- dlls/shlwapi/Makefile.in | 1 + dlls/snmpapi/Makefile.in | 1 + dlls/sti/Makefile.in | 1 + dlls/tapi32/Makefile.in | 1 + dlls/twain/Makefile.in | 1 + dlls/unicows/Makefile.in | 1 + dlls/url/Makefile.in | 1 + dlls/urlmon/Makefile.in | 1 + dlls/user/Makefile.in | 1 + dlls/uxtheme/Makefile.in | 1 + dlls/vdmdbg/Makefile.in | 1 + dlls/version/Makefile.in | 1 + dlls/win32s/Makefile.in | 1 + dlls/winaspi/Makefile.in | 1 + dlls/wined3d/Makefile.in | 1 + dlls/winedos/Makefile.in | 1 + dlls/wininet/Makefile.in | 1 + dlls/winmm/Makefile.in | 1 + dlls/winnls/Makefile.in | 1 + dlls/winsock/Makefile.in | 1 + dlls/winspool/Makefile.in | 4 ++++ dlls/wintab32/Makefile.in | 1 + dlls/wintrust/Makefile.in | 1 + dlls/wow32/Makefile.in | 1 + dlls/wsock32/Makefile.in | 1 + dlls/wtsapi32/Makefile.in | 1 + 132 files changed, 180 insertions(+), 25 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 7d75c5530f2..a6a75c19810 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -21,6 +21,8 @@ WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(MODULE).dbg.o $(RC_SRCS:.rc=.res) ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) +IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) +STATICIMPLIB= $(IMPORTLIB:.def=.def.a) all: $(MODULE)$(DLLEXT) $(SUBDIRS) @@ -31,16 +33,31 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) -o $@ -L$(DLLDIR) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) -$(SPEC_DEF): $(MAINSPEC) - $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) - # Rules for .dll files $(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) Makefile.in $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(ALL_IMPORTS:%=-l%) $(ALL_LIBS) -lib$(BASEMODULE).a: $(SPEC_DEF) +# Rules for import libraries + +.PHONY: implib static_implib $(IMPLIB_OBJS:%=__static_implib__%) + +all implib: $(IMPORTLIB) $(IMPLIB_OBJS:%=__static_implib__%) + +$(IMPLIB_OBJS:%=__static_implib__%): $(STATICIMPLIB) + +lib$(BASEMODULE).def: $(MAINSPEC) + $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) + +lib$(BASEMODULE).def.a: $(IMPLIB_OBJS) + $(RM) $@ + $(AR) $@ $(IMPLIB_OBJS) + $(RANLIB) $@ + +lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS) $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) + $(AR) $@ $(IMPLIB_OBJS) + $(RANLIB) $@ # Rules for checking that no imports are missing @@ -85,22 +102,34 @@ ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll) WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%) -.PHONY: install_lib $(ALL_SPECS16:%=_install_/%) $(ALL_SPECS16:%=_uninstall_/%) +.PHONY: install_lib install_static_implib_def install_static_implib_a +.PHONY: $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_OBJS:%=_install_static_implib_/%) $(ALL_SPECS16:%=_install_/%): install_lib cd $(dlldir) && $(RM) `basename $@`$(DLLEXT) && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`$(DLLEXT) -$(ALL_SPECS16:%=_uninstall_/%): dummy - $(RM) $(dlldir)/`basename $@`$(DLLEXT) - install_lib: $(MODULE)$(DLLEXT) $(MKINSTALLDIRS) $(dlldir) $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(dlldir)/$(MODULE)$(DLLEXT) -install:: install_lib @WIN16_INSTALL@ +$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) + $(MKINSTALLDIRS) $(dlldir) + $(INSTALL_DATA) $(IMPORTLIB) $(dlldir)/$(IMPORTLIB) + +install_static_implib_def: $(STATICIMPLIB) + $(MKINSTALLDIRS) $(dlldir) + $(INSTALL_DATA) $(STATICIMPLIB) $(dlldir)/$(STATICIMPLIB) + +install_static_implib_a: + +$(IMPLIB_OBJS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) + +install install-lib:: install_lib @WIN16_INSTALL@ + +install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_OBJS:%=_install_static_implib_/%) -uninstall:: $(ALL_SPECS16:%=_uninstall_/%) - $(RM) $(dlldir)/$(MODULE)$(DLLEXT) +uninstall:: + [ ! -d $(dlldir) ] || (cd $(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16:%=%$(DLLEXT))) # Misc. rules diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 79c5ab29e87..593142e6e08 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -2508,18 +2508,15 @@ doc-sgml: $(SUBDIRS:%=%/__doc_sgml__) # Misc rules -install install-dev:: $(IMPORT_LIBS) - $(MKINSTALLDIRS) $(dlldir) - for f in $(IMPORT_LIBS); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done +install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) -install install-lib:: $(INSTALLSUBDIRS:%=%/__install__) +install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) uninstall:: - -cd $(dlldir) && $(RM) $(IMPORT_LIBS) -rmdir $(dlldir) clean:: - $(RM) $(IMPORT_LIBS) $(SYMLINKS) + $(RM) $(IMPORT_LIBS) check test:: $(BUILDSUBDIRS:%=%/__test__) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 6309f1a3881..3e4cea62f5c 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advapi32.dll +IMPORTLIB = libadvapi32.$(IMPLIBEXT) IMPORTS = kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index ea38e1cc479..cf236f54d97 100644 --- a/dlls/advpack/Makefile.in +++ b/dlls/advpack/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advpack.dll +IMPORTLIB = libadvpack.$(IMPLIBEXT) IMPORTS = setupapi version user32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index d41f22d2c5b..b5df2da88ee 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = amstream.dll +IMPORTLIB = libamstream.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index b36105b4892..62e0a8f3763 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = atl.dll +IMPORTLIB = libatl.$(IMPLIBEXT) IMPORTS = ole32 shlwapi user32 advapi32 kernel32 EXTRALIBS = $(LIBUNICODE) -luuid diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index c025ada2e25..6f8e487e508 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = avicap32.dll +IMPORTLIB = libavicap32.$(IMPLIBEXT) IMPORTS = kernel32 ntdll C_SRCS = avicap32_main.c diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index b1b7b3bc1a6..dbf3279da53 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = avifil32.dll +IMPORTLIB = libavifil32.$(IMPLIBEXT) IMPORTS = msacm32 msvfw32 shell32 winmm ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index a14b4611e13..ba7f2310c3d 100644 --- a/dlls/cabinet/Makefile.in +++ b/dlls/cabinet/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cabinet.dll +IMPORTLIB = libcabinet.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index 6b1a8c92011..2eecfb00df4 100644 --- a/dlls/capi2032/Makefile.in +++ b/dlls/capi2032/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = capi2032.dll +IMPORTLIB = libcapi2032.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = cap20wxx.c diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in index d94ce85ab81..bca2cab2217 100644 --- a/dlls/cards/Makefile.in +++ b/dlls/cards/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cards.dll +IMPORTLIB = libcards.$(IMPLIBEXT) IMPORTS = user32 gdi32 kernel32 C_SRCS = \ diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index 5dea8093552..597f662aa72 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cfgmgr32.dll +IMPORTLIB = libcfgmgr32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 37689c592d5..04067c9ce4a 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = comcat.dll +IMPORTLIB = libcomcat.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = $(LIBUNICODE) -luuid diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index d83c626b0d2..2f0abc169a3 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = comctl32.dll +IMPORTLIB = libcomctl32.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 DELAYIMPORTS = winmm EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in index 18ec98e889f..d571e7fa7e8 100644 --- a/dlls/commdlg/Makefile.in +++ b/dlls/commdlg/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = comdlg32.dll +IMPORTLIB = libcomdlg32.$(IMPLIBEXT) IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll EXTRALIBS = -luuid diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index a93d757a392..ebf03d3c4f0 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = crtdll.dll +IMPORTLIB = libcrtdll.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 EXTRALIBS = $(LIBUNICODE) EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 6ad0b326f99..604188c217e 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = crypt32.dll +IMPORTLIB = libcrypt32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/cryptdll/Makefile.in b/dlls/cryptdll/Makefile.in index 81d72323b60..d65ed01fbbe 100644 --- a/dlls/cryptdll/Makefile.in +++ b/dlls/cryptdll/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptdll.dll +IMPORTLIB = libcryptdll.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/ctl3d/Makefile.in b/dlls/ctl3d/Makefile.in index b618ac2d46a..9e71ba66a46 100644 --- a/dlls/ctl3d/Makefile.in +++ b/dlls/ctl3d/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ctl3d32.dll +IMPORTLIB = libctl3d32.$(IMPLIBEXT) IMPORTS = user32 kernel32 C_SRCS = ctl3d32.c diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index c03b6df7a96..4f49fb17ffc 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d8.dll +IMPORTLIB = libd3d8.$(IMPLIBEXT) IMPORTS = wined3d user32 gdi32 advapi32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in index e15f203df7b..19968e859e5 100644 --- a/dlls/d3d9/Makefile.in +++ b/dlls/d3d9/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d9.dll +IMPORTLIB = libd3d9.$(IMPLIBEXT) IMPORTS = wined3d user32 gdi32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in index 10b43a2292a..21886c901ff 100644 --- a/dlls/d3dim/Makefile.in +++ b/dlls/d3dim/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dim.dll +IMPORTLIB = libd3dim.$(IMPLIBEXT) C_SRCS = d3dim_main.c @@ -11,4 +12,3 @@ RC_SRCS = version.rc @MAKE_DLL_RULES@ ### Dependencies: - diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index ec3bf7a5a7c..81adee3fc25 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3drm.dll +IMPORTLIB = libd3drm.$(IMPLIBEXT) C_SRCS = d3drm_main.c diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in index abc45c06a36..4ddc48df9dc 100644 --- a/dlls/d3dx8/Makefile.in +++ b/dlls/d3dx8/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx8.dll +IMPORTLIB = libd3dx8.$(IMPLIBEXT) IMPORTS = d3d8 user32 gdi32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index ba7703f9b2c..fa0ba154c7a 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dxof.dll +IMPORTLIB = libd3dxof.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 582fab06c3e..fc37d627780 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dbghelp.dll +IMPORTLIB = libdbghelp.$(IMPLIBEXT) IMPORTS = psapi kernel32 ntdll C_SRCS = \ diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in index ed848e356da..8699b292972 100644 --- a/dlls/dciman32/Makefile.in +++ b/dlls/dciman32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dciman32.dll +IMPORTLIB = libdciman32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = dciman_main.c diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 59463f466ed..535b3d84d04 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw.dll +IMPORTLIB = libddraw.$(IMPLIBEXT) IMPORTS = ole32 user32 gdi32 advapi32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index f03b776fdc2..659725b9257 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = devenum.dll +IMPORTLIB = libdevenum.$(IMPLIBEXT) IMPORTS = ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 4a47fdc3245..a68c5912e41 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dinput.dll +IMPORTLIB = libdinput.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid @@ -16,6 +17,8 @@ C_SRCS = \ mouse.c \ regsvr.c +IMPLIB_SRCS = data_formats.c + RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 8494fd6e74b..9d80f796a92 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dinput8.dll +IMPORTLIB = libdinput8.$(IMPLIBEXT) IMPORTS = dinput EXTRALIBS = -luuid diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 667a7f4f0e4..1dcf1ea0b0b 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmband.dll +IMPORTLIB = libdmband.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in index 95a2ccc0b80..94dabc17347 100644 --- a/dlls/dmcompos/Makefile.in +++ b/dlls/dmcompos/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmcompos.dll +IMPORTLIB = libdmcompos.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index 1ce9ee6ec50..7f745830254 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmime.dll +IMPORTLIB = libdmime.$(IMPLIBEXT) IMPORTS = dsound winmm ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in index 2bb731ef3ca..3115ca0c2cf 100644 --- a/dlls/dmloader/Makefile.in +++ b/dlls/dmloader/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmloader.dll +IMPORTLIB = libdmloader.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in index a7e9737e2af..84919f3a2e1 100644 --- a/dlls/dmscript/Makefile.in +++ b/dlls/dmscript/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmscript.dll +IMPORTLIB = libdmscript.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in index edfc1a55062..a1d53c21fef 100644 --- a/dlls/dmstyle/Makefile.in +++ b/dlls/dmstyle/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmstyle.dll +IMPORTLIB = libdmstyle.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index 0da9f8d2a80..6f2f07f84d5 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmsynth.dll +IMPORTLIB = libdmsynth.$(IMPLIBEXT) IMPORTS = winmm ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index eded608c5c1..7b8f89c672c 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmusic.dll +IMPORTLIB = libdmusic.$(IMPLIBEXT) IMPORTS = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in index 6d18c1745a6..18d7fac8d48 100644 --- a/dlls/dmusic32/Makefile.in +++ b/dlls/dmusic32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmusic32.dll +IMPORTLIB = libdmusic32.$(IMPLIBEXT) IMPORTS = winmm user32 advapi32 kernel32 EXTRALIBS = -luuid diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in index e0d2e700bae..b8145ebbb09 100644 --- a/dlls/dplay/Makefile.in +++ b/dlls/dplay/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dplay.dll +IMPORTLIB = libdplay.$(IMPLIBEXT) IMPORTS = dplayx C_SRCS = dplay_main.c diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 0bdf824a24e..ce6cd4dcae9 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dplayx.dll +IMPORTLIB = libdplayx.$(IMPLIBEXT) IMPORTS = winmm ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 22ff1c1d249..379073b4da9 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dpnet.dll +IMPORTLIB = libdpnet.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dpnhpast/Makefile.in b/dlls/dpnhpast/Makefile.in index 49d60399070..3b3b79bbee1 100644 --- a/dlls/dpnhpast/Makefile.in +++ b/dlls/dpnhpast/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dpnhpast.dll +IMPORTLIB = libdpnhpast.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index bc39dca0263..3582783f869 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dsound.dll +IMPORTLIB = libdsound.$(IMPLIBEXT) IMPORTS = winmm ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index 3e5eeb835c3..59fe32c1a8c 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dswave.dll +IMPORTLIB = libdswave.$(IMPLIBEXT) IMPORTS = msacm32 ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 28809ebf605..3235fa0e9b3 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dxdiagn.dll +IMPORTLIB = libdxdiagn.$(IMPLIBEXT) IMPORTS = ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in index 7755ae98e97..39a9f6e58e7 100644 --- a/dlls/gdi/Makefile.in +++ b/dlls/gdi/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = gdi32.dll +IMPORTLIB = libgdi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 ntdll EXTRAINCL = @FREETYPEINCL@ EXTRALIBS = $(LIBUNICODE) @ICULIBS@ diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 316a1c63190..1d3771e0829 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = glu32.dll +IMPORTLIB = libglu32.$(IMPLIBEXT) IMPORTS = kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/glut32/Makefile.in b/dlls/glut32/Makefile.in index cd3aef47095..3bf2b009d1f 100644 --- a/dlls/glut32/Makefile.in +++ b/dlls/glut32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = glut32.dll +IMPORTLIB = libglut32.$(IMPLIBEXT) IMPORTS = kernel32 EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @GLUT_LIBS@ diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index f4df96a3bcb..8c2c9fe7970 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = iccvid.dll +IMPORTLIB = libiccvid.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index 162196a665f..91f4b61c620 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = icmp.dll +IMPORTLIB = libicmp.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = icmp_main.c diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index 59f263f1ab2..7f40273c305 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = imagehlp.dll +IMPORTLIB = libimagehlp.$(IMPLIBEXT) IMPORTS = dbghelp kernel32 ntdll C_SRCS = \ diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 7f0c27f77a4..54049bccadc 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = imm32.dll +IMPORTLIB = libimm32.$(IMPLIBEXT) IMPORTS = user32 gdi32 kernel32 C_SRCS = \ diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 18bc68a5a35..713f1f10d5c 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = iphlpapi.dll +IMPORTLIB = libiphlpapi.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index a04f9a10a8e..ba831dd0eb1 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = itss.dll +IMPORTLIB = libitss.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) -luuid EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in index d4815330a28..14a52030f93 100644 --- a/dlls/kernel/Makefile.in +++ b/dlls/kernel/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = kernel32.dll +IMPORTLIB = libkernel32.$(IMPLIBEXT) IMPORTS = ntdll EXTRALIBS = $(LIBUNICODE) @COREFOUNDATIONLIB@ diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in index 65642c6f63c..9f470f13f4e 100644 --- a/dlls/lzexpand/Makefile.in +++ b/dlls/lzexpand/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = lz32.dll +IMPORTLIB = liblz32.$(IMPLIBEXT) IMPORTS = kernel32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/make_dlls b/dlls/make_dlls index e0eef0258bf..8481c44d191 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -308,18 +308,15 @@ doc-sgml: \$(SUBDIRS:%=%/__doc_sgml__) # Misc rules -install install-dev:: \$(IMPORT_LIBS) - \$(MKINSTALLDIRS) \$(dlldir) - for f in \$(IMPORT_LIBS); do \$(INSTALL_DATA) \$\$f \$(dlldir)/\$\$f; done +install-lib:: \$(INSTALLSUBDIRS:%=%/__install-lib__) -install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__) +install-dev:: \$(INSTALLSUBDIRS:%=%/__install-dev__) uninstall:: - -cd \$(dlldir) && \$(RM) \$(IMPORT_LIBS) -rmdir \$(dlldir) clean:: - \$(RM) \$(IMPORT_LIBS) \$(SYMLINKS) + \$(RM) \$(IMPORT_LIBS) check test:: \$(BUILDSUBDIRS:%=%/__test__) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index d835e81f029..1a3576df7cb 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mapi32.dll +IMPORTLIB = libmapi32.$(IMPLIBEXT) IMPORTS = shlwapi ole32 user32 kernel32 ntdll EXTRALIBS = -luuid $(LIBUNICODE) diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index 3af44d5c28d..7d4e013e30d 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mlang.dll +IMPORTLIB = libmlang.$(IMPLIBEXT) IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) -luuid EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 2f8fedca560..5ad211abe0f 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mpr.dll +IMPORTLIB = libmpr.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in index 476a1d37ef9..4f3905c33fa 100644 --- a/dlls/msacm/Makefile.in +++ b/dlls/msacm/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msacm32.dll +IMPORTLIB = libmsacm32.$(IMPLIBEXT) IMPORTS = winmm user32 advapi32 kernel32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index d93bf47c26c..714f3f7267f 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mscms.dll +IMPORTLIB = libmscms.$(IMPLIBEXT) IMPORTS = kernel32 ntdll C_SRCS = \ diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 3b231a3a79f..cdc37457283 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msdmo.dll +IMPORTLIB = libmsdmo.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index ec94017a3f0..a777e70e77f 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mshtml.dll +IMPORTLIB = libmshtml.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) -lstrmiids -luuid EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 78647adbebb..8b0574901d2 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msi.dll +IMPORTLIB = libmsi.$(IMPLIBEXT) IMPORTS = shell32 cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid $(LIBUNICODE) diff --git a/dlls/msimg32/Makefile.in b/dlls/msimg32/Makefile.in index 9314038c22a..3d097d3e85a 100644 --- a/dlls/msimg32/Makefile.in +++ b/dlls/msimg32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msimg32.dll +IMPORTLIB = libmsimg32.$(IMPLIBEXT) IMPORTS = gdi32 kernel32 C_SRCS = msimg32_main.c diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index 4e5fe3a2ad2..b1a2fcc0795 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msnet32.dll +IMPORTLIB = libmsnet32.$(IMPLIBEXT) C_SRCS = msnet_main.c diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 4d406c9be91..81ca349aa0e 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msrle32.dll +IMPORTLIB = libmsrle32.$(IMPLIBEXT) IMPORTS = winmm user32 kernel32 C_SRCS = msrle32.c diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 5214db92ad8..56e70a583b4 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcrt.dll +IMPORTLIB = libmsvcrt.$(IMPLIBEXT) IMPORTS = kernel32 ntdll DELAYIMPORTS = user32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index b652467d172..47961c6f41f 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcrt20.dll +IMPORTLIB = libmsvcrt20.$(IMPLIBEXT) IMPORTS = msvcrt EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 5d6b04bbbb9..2efce54539f 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcrt40.dll +IMPORTLIB = libmsvcrt40.$(IMPLIBEXT) IMPORTS = msvcrt C_SRCS = msvcrt40.c diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index c461807d6c6..8ce9810819a 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcrtd.dll +IMPORTLIB = libmsvcrtd.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 C_SRCS = \ diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index cc0e0a5e72e..d1246ef655b 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvidc32.dll +IMPORTLIB = libmsvidc32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in index 0bd981e71e7..cd508847611 100644 --- a/dlls/msvideo/Makefile.in +++ b/dlls/msvideo/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvfw32.dll +IMPORTLIB = libmsvfw32.$(IMPLIBEXT) IMPORTS = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in index def22515864..c92667039ce 100644 --- a/dlls/mswsock/Makefile.in +++ b/dlls/mswsock/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mswsock.dll +IMPORTLIB = libmswsock.$(IMPLIBEXT) IMPORTS = ws2_32 iphlpapi kernel32 C_SRCS = \ diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index da5963ae906..8bb7932055e 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = netapi32.dll +IMPORTLIB = libnetapi32.$(IMPLIBEXT) IMPORTS = iphlpapi ws2_32 advapi32 kernel32 C_SRCS = \ diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index 44b49a06e66..8bda487ef6f 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = newdev.dll +IMPORTLIB = libnewdev.$(IMPLIBEXT) C_SRCS = main.c diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 21ba9d433e7..97bd26a103a 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ntdll.dll +IMPORTLIB = libntdll.$(IMPLIBEXT) EXTRALIBS = $(LIBUNICODE) @IOKITLIB@ C_SRCS = \ diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 3b1d44dd92c..6790289f071 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = odbc32.dll +IMPORTLIB = libodbc32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 481074346f5..782767fdcbc 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ole32.dll +IMPORTLIB = libole32.$(IMPLIBEXT) IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll EXTRALIBS = -luuid $(LIBUNICODE) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 64801426d79..19d511e4f7d 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleacc.dll +IMPORTLIB = liboleacc.$(IMPLIBEXT) C_SRCS = \ main.c diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 2c360b09b58..ce81e8e799b 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleaut32.dll +IMPORTLIB = liboleaut32.$(IMPLIBEXT) IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = comctl32 urlmon EXTRALIBS = $(LIBUNICODE) -luuid diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in index 861d11923e5..2641d4ad2c2 100644 --- a/dlls/olecli/Makefile.in +++ b/dlls/olecli/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olecli32.dll +IMPORTLIB = libolecli32.$(IMPLIBEXT) IMPORTS = ole32 gdi32 kernel32 C_SRCS = \ diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 9f0a1e1858e..8452ccdc050 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oledlg.dll +IMPORTLIB = liboledlg.$(IMPLIBEXT) IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll C_SRCS = \ diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index 280fd841b05..bcc8cfd4acc 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olepro32.dll +IMPORTLIB = libolepro32.$(IMPLIBEXT) IMPORTS = oleaut32 C_SRCS = olepro32stubs.c diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in index 9e7840c170a..7c96f6153c7 100644 --- a/dlls/olesvr/Makefile.in +++ b/dlls/olesvr/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olesvr32.dll +IMPORTLIB = libolesvr32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index bb8eff5728b..aceb3020931 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = opengl32.dll +IMPORTLIB = libopengl32.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index 100e3fd8af2..b71d0411e72 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = powrprof.dll +IMPORTLIB = libpowrprof.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index 53f1029ca99..732a2c3b7c5 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = psapi.dll +IMPORTLIB = libpsapi.$(IMPLIBEXT) IMPORTS = kernel32 ntdll C_SRCS = \ diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 11097479714..182799a51a3 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qcap.dll +IMPORTLIB = libqcap.$(IMPLIBEXT) IMPORTS = ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 221048bfabe..da31108a8fe 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = quartz.dll +IMPORTLIB = libquartz.$(IMPLIBEXT) IMPORTS = dsound ddraw msacm32 msvfw32 ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index bf1928979c9..59762afd621 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rasapi32.dll +IMPORTLIB = librasapi32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = rasapi.c diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 9cc9fe9844b..6fbec4a269a 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched20.dll +IMPORTLIB = libriched20.$(IMPLIBEXT) IMPORTS = user32 gdi32 kernel32 EXTRALIBS = -luuid diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in index 2ac1aea6304..738ba76542a 100644 --- a/dlls/richedit/Makefile.in +++ b/dlls/richedit/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched32.dll +IMPORTLIB = libriched32.$(IMPLIBEXT) IMPORTS = riched20 user32 kernel32 C_SRCS = \ diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 5a04b54e7c2..945baea78d5 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rpcrt4.dll +IMPORTLIB = librpcrt4.$(IMPLIBEXT) IMPORTS = iphlpapi advapi32 kernel32 ntdll EXTRALIBS = -luuid diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in index e034328e0de..ec86156b724 100644 --- a/dlls/rsabase/Makefile.in +++ b/dlls/rsabase/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rsabase.dll +IMPORTLIB = librsabase.$(IMPLIBEXT) IMPORTS = rsaenh SUBDIRS = tests diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index f0ab25af7a0..c84552041f8 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rsaenh.dll +IMPORTLIB = librsaenh.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 8f46aa3b84a..71907274feb 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = secur32.dll +IMPORTLIB = libsecur32.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 ntdll C_SRCS = \ diff --git a/dlls/sensapi/Makefile.in b/dlls/sensapi/Makefile.in index f9ecb161109..b9d9452ccef 100644 --- a/dlls/sensapi/Makefile.in +++ b/dlls/sensapi/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sensapi.dll +IMPORTLIB = libsensapi.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index e4d8ddeaebf..910911e492c 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = serialui.dll +IMPORTLIB = libserialui.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index b3444fbe957..676c3ce9a8c 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = setupapi.dll +IMPORTLIB = libsetupapi.$(IMPLIBEXT) IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll DELAYIMPORTS = shell32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index f93b74e0ec5..d7d899495d1 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shdocvw.dll +IMPORTLIB = libshdocvw.$(IMPLIBEXT) IMPORTS = urlmon ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 1c024e7eb8c..af317fcf20a 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shell32.dll +IMPORTLIB = libshell32.$(IMPLIBEXT) IMPORTS = shlwapi comctl32 user32 gdi32 advapi32 kernel32 DELAYIMPORTS = ole32 EXTRALIBS = -luuid $(LIBUNICODE) diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in index fcafcd61da7..5dc0941effd 100644 --- a/dlls/shfolder/Makefile.in +++ b/dlls/shfolder/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shfolder.dll +IMPORTLIB = libshfolder.$(IMPLIBEXT) IMPORTS = shell32 C_SRCS = shfolder_main.c @@ -10,4 +11,3 @@ C_SRCS = shfolder_main.c @MAKE_DLL_RULES@ ### Dependencies: - diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index fc09c5e4dcb..4dbb8d20565 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shlwapi.dll +IMPORTLIB = libshlwapi.$(IMPLIBEXT) IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = oleaut32 EXTRALIBS = -luuid $(LIBUNICODE) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index 1c73a6bc0fc..df25c4326fa 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = snmpapi.dll +IMPORTLIB = libsnmpapi.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index c270d6a3be2..56efe719df0 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sti.dll +IMPORTLIB = libsti.$(IMPLIBEXT) C_SRCS = sti_main.c diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index 86d2ca96a89..b6956e469be 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = tapi32.dll +IMPORTLIB = libtapi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/twain/Makefile.in b/dlls/twain/Makefile.in index 6e26243a7c2..68d27512de9 100644 --- a/dlls/twain/Makefile.in +++ b/dlls/twain/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = twain_32.dll +IMPORTLIB = libtwain_32.$(IMPLIBEXT) IMPORTS = user32 gdi32 kernel32 ntdll EXTRALIBS = @SANELIBS@ EXTRAINCL = @SANEINCL@ diff --git a/dlls/unicows/Makefile.in b/dlls/unicows/Makefile.in index 617926d6399..84780a2dd3f 100644 --- a/dlls/unicows/Makefile.in +++ b/dlls/unicows/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = unicows.dll +IMPORTLIB = libunicows.$(IMPLIBEXT) IMPORTS = avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool \ rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 kernel32 diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 13c514b3eee..dabb32f3a98 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = url.dll +IMPORTLIB = liburl.$(IMPLIBEXT) C_SRCS = url_main.c diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 9b1d4a52f05..3a98f2de86b 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = urlmon.dll +IMPORTLIB = liburlmon.$(IMPLIBEXT) IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index d03ef7d9a43..782747d67ec 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = user32.dll +IMPORTLIB = libuser32.$(IMPLIBEXT) IMPORTS = gdi32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 7dbc1444c01..27e46a57122 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = uxtheme.dll +IMPORTLIB = libuxtheme.$(IMPLIBEXT) IMPORTS = shlwapi user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = msimg32 EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in index 4248e902834..472b209ec90 100644 --- a/dlls/vdmdbg/Makefile.in +++ b/dlls/vdmdbg/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = vdmdbg.dll +IMPORTLIB = libvdmdbg.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 092c682728c..cddf024fa1a 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = version.dll +IMPORTLIB = libversion.$(IMPLIBEXT) IMPORTS = lz32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in index e3788b68cbf..0dd96b29842 100644 --- a/dlls/win32s/Makefile.in +++ b/dlls/win32s/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = w32skrnl.dll +IMPORTLIB = libw32skrnl.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/winaspi/Makefile.in b/dlls/winaspi/Makefile.in index 8fbfbcee040..d8109ec42f0 100644 --- a/dlls/winaspi/Makefile.in +++ b/dlls/winaspi/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wnaspi32.dll +IMPORTLIB = libwnaspi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 C_SRCS = \ diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 2f6bcdb58f3..6c8e2e73fcb 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wined3d.dll +IMPORTLIB = libwined3d.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 8dc0387c823..bfeaff0a6c2 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedos.dll +IMPORTLIB = libwinedos.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index cea2a82a299..5b33c13cac5 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wininet.dll +IMPORTLIB = libwininet.$(IMPLIBEXT) IMPORTS = mpr shlwapi shell32 user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) @SOCKETLIBS@ diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index fe490387f0e..23d71111f3e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winmm.dll +IMPORTLIB = libwinmm.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/winnls/Makefile.in b/dlls/winnls/Makefile.in index 5cf67b8391f..49b652bbbfc 100644 --- a/dlls/winnls/Makefile.in +++ b/dlls/winnls/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winnls32.dll +IMPORTLIB = libwinnls32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/winsock/Makefile.in b/dlls/winsock/Makefile.in index 5f03748d7e9..032bab84ebc 100644 --- a/dlls/winsock/Makefile.in +++ b/dlls/winsock/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ws2_32.dll +IMPORTLIB = libws2_32.$(IMPLIBEXT) IMPORTS = user32 iphlpapi kernel32 ntdll EXTRALIBS = $(LIBUNICODE) diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in index bf5cda705e1..e2b8783c193 100644 --- a/dlls/winspool/Makefile.in +++ b/dlls/winspool/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winspool.drv +IMPORTLIB = libwinspool.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ @@ -14,4 +15,7 @@ SUBDIRS = tests @MAKE_DLL_RULES@ +$(IMPORTLIB): lib$(BASEMODULE).$(IMPLIBEXT) + $(RM) $@ && $(LN_S) lib$(BASEMODULE).$(IMPLIBEXT) $@ + ### Dependencies: diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 9dff142d6a9..72d8d87d4b4 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wintab32.dll +IMPORTLIB = libwintab32.$(IMPLIBEXT) IMPORTS = user32 kernel32 C_SRCS = \ diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 09f7d51e2cf..52d47c8b4bc 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wintrust.dll +IMPORTLIB = libwintrust.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = wintrust_main.c diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 0ce202cf222..fb110511863 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wow32.dll +IMPORTLIB = libwow32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = wow_main.c diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index fdc44d9b7ee..3cca30806e9 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wsock32.dll +IMPORTLIB = libwsock32.$(IMPLIBEXT) IMPORTS = ws2_32 iphlpapi kernel32 C_SRCS = \ diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index b76079f0c38..ee8a62889e4 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wtsapi32.dll +IMPORTLIB = libwtsapi32.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ -- 2.11.4.GIT