Respect given buffer size in GET EXTENDED COUNTRY INFORMATION.
[wine] / dlls / Makefile.in
index 02d1c3e..7bee5fb 100644 (file)
@@ -18,10 +18,12 @@ EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
 BASEDIRS = \
        advapi32 \
        amstream \
+       atl \
        avicap32 \
        avifil32 \
        cabinet \
        capi2032 \
+       cards \
        cfgmgr32 \
        comcat \
        comctl32 \
@@ -30,6 +32,9 @@ BASEDIRS = \
        crypt32 \
        ctl3d \
        d3dim \
+       d3drm \
+       d3dxof \
+       dbghelp \
        dciman32 \
        devenum \
        dinput \
@@ -45,19 +50,24 @@ BASEDIRS = \
        dmusic32 \
        dplay \
        dplayx \
+       dpnet \
        dpnhpast \
        dsound \
        dswave \
+       dxdiagn \
        gdi \
+       hhctrl.ocx \
        iccvid \
        icmp \
        ifsmgr.vxd \
        imagehlp \
        imm32 \
        iphlpapi \
+       itss \
        kernel \
        lzexpand \
        mapi32 \
+       mlang \
        mmdevldr.vxd \
        monodebg.vxd \
        mpr \
@@ -116,6 +126,7 @@ BASEDIRS = \
        user \
        uxtheme \
        vdhcp.vxd \
+       vdmdbg \
        version \
        vmm.vxd \
        vnbt.vxd \
@@ -162,6 +173,7 @@ SUBDIRS = \
        glu32 \
        glut32 \
        opengl32 \
+       strmiids \
        uuid \
        wined3d \
        x11drv
@@ -209,6 +221,7 @@ WIN16_FILES = \
        stress.dll.so \
        system.drv.so \
        toolhelp.dll.so \
+       twain.dll.so \
        typelib.dll.so \
        user.exe.so \
        ver.dll.so \
@@ -229,10 +242,12 @@ SYMLINKS_SO = \
        @WIN16_FILES@ \
        advapi32.dll.so \
        amstream.dll.so \
+       atl.dll.so \
        avicap32.dll.so \
        avifil32.dll.so \
        cabinet.dll.so \
        capi2032.dll.so \
+       cards.dll.so \
        cfgmgr32.dll.so \
        comcat.dll.so \
        comctl32.dll.so \
@@ -241,6 +256,9 @@ SYMLINKS_SO = \
        crypt32.dll.so \
        ctl3d32.dll.so \
        d3dim.dll.so \
+       d3drm.dll.so \
+       d3dxof.dll.so \
+       dbghelp.dll.so \
        dciman32.dll.so \
        devenum.dll.so \
        dinput.dll.so \
@@ -256,10 +274,13 @@ SYMLINKS_SO = \
        dmusic32.dll.so \
        dplay.dll.so \
        dplayx.dll.so \
+       dpnet.dll.so \
        dpnhpast.dll.so \
        dsound.dll.so \
        dswave.dll.so \
+       dxdiagn.dll.so \
        gdi32.dll.so \
+       hhctrl.ocx.so \
        iccvid.dll.so \
        icmp.dll.so \
        ifsmgr.vxd.so \
@@ -267,11 +288,13 @@ SYMLINKS_SO = \
        imagehlp.dll.so \
        imm32.dll.so \
        iphlpapi.dll.so \
+       itss.dll.so \
        joystick.drv.so \
        kernel32.dll.so \
        libdxerr8.a \
        libdxerr9.a \
        libdxguid.a \
+       libstrmiids.a \
        libuuid.a \
        lz32.dll.so \
        mapi32.dll.so \
@@ -281,6 +304,7 @@ SYMLINKS_SO = \
        mciseq.drv.so \
        mciwave.drv.so \
        midimap.drv.so \
+       mlang.dll.so \
        mmdevldr.vxd.so \
        monodebg.vxd.so \
        mpr.dll.so \
@@ -338,6 +362,7 @@ SYMLINKS_SO = \
        user32.dll.so \
        uxtheme.dll.so \
        vdhcp.vxd.so \
+       vdmdbg.dll.so \
        version.dll.so \
        vmm.vxd.so \
        vnbt.vxd.so \
@@ -375,8 +400,6 @@ symlinks.so: $(SYMLINKS_SO)
 
 symlinks: $(BUILDSUBDIRS)
 
-implib: $(ALL_IMPORT_LIBS)
-
 
 # Map symlink name to the corresponding library
 
@@ -386,6 +409,9 @@ advapi32.dll.so: advapi32/advapi32.dll.so
 amstream.dll.so: amstream/amstream.dll.so
        $(RM) $@ && $(LN_S) amstream/amstream.dll.so $@
 
+atl.dll.so: atl/atl.dll.so
+       $(RM) $@ && $(LN_S) atl/atl.dll.so $@
+
 avicap32.dll.so: avicap32/avicap32.dll.so
        $(RM) $@ && $(LN_S) avicap32/avicap32.dll.so $@
 
@@ -401,6 +427,9 @@ cabinet.dll.so: cabinet/cabinet.dll.so
 capi2032.dll.so: capi2032/capi2032.dll.so
        $(RM) $@ && $(LN_S) capi2032/capi2032.dll.so $@
 
+cards.dll.so: cards/cards.dll.so
+       $(RM) $@ && $(LN_S) cards/cards.dll.so $@
+
 cfgmgr32.dll.so: cfgmgr32/cfgmgr32.dll.so
        $(RM) $@ && $(LN_S) cfgmgr32/cfgmgr32.dll.so $@
 
@@ -437,9 +466,18 @@ d3d9.dll.so: d3d9/d3d9.dll.so
 d3dim.dll.so: d3dim/d3dim.dll.so
        $(RM) $@ && $(LN_S) d3dim/d3dim.dll.so $@
 
+d3drm.dll.so: d3drm/d3drm.dll.so
+       $(RM) $@ && $(LN_S) d3drm/d3drm.dll.so $@
+
 d3dx8.dll.so: d3dx8/d3dx8.dll.so
        $(RM) $@ && $(LN_S) d3dx8/d3dx8.dll.so $@
 
+d3dxof.dll.so: d3dxof/d3dxof.dll.so
+       $(RM) $@ && $(LN_S) d3dxof/d3dxof.dll.so $@
+
+dbghelp.dll.so: dbghelp/dbghelp.dll.so
+       $(RM) $@ && $(LN_S) dbghelp/dbghelp.dll.so $@
+
 dciman32.dll.so: dciman32/dciman32.dll.so
        $(RM) $@ && $(LN_S) dciman32/dciman32.dll.so $@
 
@@ -488,6 +526,9 @@ dplay.dll.so: dplay/dplay.dll.so
 dplayx.dll.so: dplayx/dplayx.dll.so
        $(RM) $@ && $(LN_S) dplayx/dplayx.dll.so $@
 
+dpnet.dll.so: dpnet/dpnet.dll.so
+       $(RM) $@ && $(LN_S) dpnet/dpnet.dll.so $@
+
 dpnhpast.dll.so: dpnhpast/dpnhpast.dll.so
        $(RM) $@ && $(LN_S) dpnhpast/dpnhpast.dll.so $@
 
@@ -497,6 +538,9 @@ dsound.dll.so: dsound/dsound.dll.so
 dswave.dll.so: dswave/dswave.dll.so
        $(RM) $@ && $(LN_S) dswave/dswave.dll.so $@
 
+dxdiagn.dll.so: dxdiagn/dxdiagn.dll.so
+       $(RM) $@ && $(LN_S) dxdiagn/dxdiagn.dll.so $@
+
 gdi32.dll.so: gdi/gdi32.dll.so
        $(RM) $@ && $(LN_S) gdi/gdi32.dll.so $@
 
@@ -509,6 +553,9 @@ glu32.dll.so: glu32/glu32.dll.so
 glut32.dll.so: glut32/glut32.dll.so
        $(RM) $@ && $(LN_S) glut32/glut32.dll.so $@
 
+hhctrl.ocx.so: hhctrl.ocx/hhctrl.ocx.so
+       $(RM) $@ && $(LN_S) hhctrl.ocx/hhctrl.ocx.so $@
+
 iccvid.dll.so: iccvid/iccvid.dll.so
        $(RM) $@ && $(LN_S) iccvid/iccvid.dll.so $@
 
@@ -533,6 +580,9 @@ imm.dll.so : imm32.dll.so
 iphlpapi.dll.so: iphlpapi/iphlpapi.dll.so
        $(RM) $@ && $(LN_S) iphlpapi/iphlpapi.dll.so $@
 
+itss.dll.so: itss/itss.dll.so
+       $(RM) $@ && $(LN_S) itss/itss.dll.so $@
+
 joystick.drv.so: winmm/joystick/joystick.drv.so
        $(RM) $@ && $(LN_S) winmm/joystick/joystick.drv.so $@
 
@@ -571,6 +621,9 @@ mciwave.drv.so: winmm/mciwave/mciwave.drv.so
 midimap.drv.so: winmm/midimap/midimap.drv.so
        $(RM) $@ && $(LN_S) winmm/midimap/midimap.drv.so $@
 
+mlang.dll.so: mlang/mlang.dll.so
+       $(RM) $@ && $(LN_S) mlang/mlang.dll.so $@
+
 mmdevldr.vxd.so: mmdevldr.vxd/mmdevldr.vxd.so
        $(RM) $@ && $(LN_S) mmdevldr.vxd/mmdevldr.vxd.so $@
 
@@ -756,6 +809,9 @@ ttydrv.dll.so: ttydrv/ttydrv.dll.so
 twain_32.dll.so: twain/twain_32.dll.so
        $(RM) $@ && $(LN_S) twain/twain_32.dll.so $@
 
+twain.dll.so : twain_32.dll.so
+       $(RM) $@ && $(LN_S) twain_32.dll.so $@
+
 unicows.dll.so: unicows/unicows.dll.so
        $(RM) $@ && $(LN_S) unicows/unicows.dll.so $@
 
@@ -778,6 +834,9 @@ uxtheme.dll.so: uxtheme/uxtheme.dll.so
 vdhcp.vxd.so: vdhcp.vxd/vdhcp.vxd.so
        $(RM) $@ && $(LN_S) vdhcp.vxd/vdhcp.vxd.so $@
 
+vdmdbg.dll.so: vdmdbg/vdmdbg.dll.so
+       $(RM) $@ && $(LN_S) vdmdbg/vdmdbg.dll.so $@
+
 version.dll.so: version/version.dll.so
        $(RM) $@ && $(LN_S) version/version.dll.so $@
 
@@ -898,6 +957,9 @@ libdxerr9.a: dxerr9/libdxerr9.a
 libdxguid.a: dxguid/libdxguid.a
        $(RM) $@ && $(LN_S) dxguid/libdxguid.a $@
 
+libstrmiids.a: strmiids/libstrmiids.a
+       $(RM) $@ && $(LN_S) strmiids/libstrmiids.a $@
+
 libuuid.a: uuid/libuuid.a
        $(RM) $@ && $(LN_S) uuid/libuuid.a $@
 
@@ -905,128 +967,138 @@ libuuid.a: uuid/libuuid.a
 # Import libraries
 
 IMPORT_LIBS = \
-       libadvapi32 \
-       libamstream \
-       libavicap32 \
-       libavifil32 \
-       libcabinet \
-       libcapi2032 \
-       libcfgmgr32 \
-       libcomcat \
-       libcomctl32 \
-       libcomdlg32 \
-       libcrtdll \
-       libcrypt32 \
-       libctl3d32 \
-       libd3d8 \
-       libd3d9 \
-       libd3dim \
-       libd3dx8 \
-       libdciman32 \
-       libddraw \
-       libdevenum \
-       libdinput \
-       libdinput8 \
-       libdmband \
-       libdmcompos \
-       libdmime \
-       libdmloader \
-       libdmscript \
-       libdmstyle \
-       libdmsynth \
-       libdmusic \
-       libdmusic32 \
-       libdplay \
-       libdplayx \
-       libdpnhpast \
-       libdsound \
-       libdswave \
-       libgdi32 \
-       libglu32 \
-       libglut32 \
-       libiccvid \
-       libicmp \
-       libimagehlp \
-       libimm32 \
-       libiphlpapi \
-       libkernel32 \
-       liblz32 \
-       libmapi32 \
-       libmpr \
-       libmsacm32 \
-       libmsdmo \
-       libmshtml \
-       libmsi \
-       libmsimg32 \
-       libmsnet32 \
-       libmsrle32 \
-       libmsvcrt \
-       libmsvcrt20 \
-       libmsvcrt40 \
-       libmsvcrtd \
-       libmsvfw32 \
-       libmsvidc32 \
-       libmswsock \
-       libnetapi32 \
-       libnewdev \
-       libntdll \
-       libodbc32 \
-       libole32 \
-       liboleacc \
-       liboleaut32 \
-       libolecli32 \
-       liboledlg \
-       libolepro32 \
-       libolesvr32 \
-       libopengl32 \
-       libpsapi \
-       libqcap \
-       libquartz \
-       librasapi32 \
-       libriched32 \
-       librpcrt4 \
-       librsabase \
-       libsecur32 \
-       libserialui \
-       libsetupapi \
-       libshdocvw \
-       libshell32 \
-       libshfolder \
-       libshlwapi \
-       libsnmpapi \
-       libsti \
-       libtapi32 \
-       libttydrv \
-       libtwain_32 \
-       libunicows \
-       liburl \
-       liburlmon \
-       libuser32 \
-       libuxtheme \
-       libversion \
-       libw32skrnl \
-       libwined3d \
-       libwinedos \
-       libwineps \
-       libwininet \
-       libwinmm \
-       libwinnls32 \
-       libwinspool \
-       libwintab32 \
-       libwintrust \
-       libwnaspi32 \
-       libwow32 \
-       libws2_32 \
-       libwsock32 \
-       libx11drv
-
-ALL_IMPORT_LIBS = \
-       $(IMPORT_LIBS:%=%.$(IMPLIBEXT)) \
+       libadvapi32.$(IMPLIBEXT) \
+       libamstream.$(IMPLIBEXT) \
+       libatl.$(IMPLIBEXT) \
+       libavicap32.$(IMPLIBEXT) \
+       libavifil32.$(IMPLIBEXT) \
+       libcabinet.$(IMPLIBEXT) \
+       libcapi2032.$(IMPLIBEXT) \
+       libcards.$(IMPLIBEXT) \
+       libcfgmgr32.$(IMPLIBEXT) \
+       libcomcat.$(IMPLIBEXT) \
+       libcomctl32.$(IMPLIBEXT) \
+       libcomdlg32.$(IMPLIBEXT) \
+       libcrtdll.$(IMPLIBEXT) \
+       libcrypt32.$(IMPLIBEXT) \
+       libctl3d32.$(IMPLIBEXT) \
+       libd3d8.$(IMPLIBEXT) \
+       libd3d9.$(IMPLIBEXT) \
+       libd3dim.$(IMPLIBEXT) \
+       libd3drm.$(IMPLIBEXT) \
+       libd3dx8.$(IMPLIBEXT) \
+       libd3dxof.$(IMPLIBEXT) \
+       libdbghelp.$(IMPLIBEXT) \
+       libdciman32.$(IMPLIBEXT) \
+       libddraw.$(IMPLIBEXT) \
+       libdevenum.$(IMPLIBEXT) \
+       libdinput.$(IMPLIBEXT) \
+       libdinput8.$(IMPLIBEXT) \
+       libdmband.$(IMPLIBEXT) \
+       libdmcompos.$(IMPLIBEXT) \
+       libdmime.$(IMPLIBEXT) \
+       libdmloader.$(IMPLIBEXT) \
+       libdmscript.$(IMPLIBEXT) \
+       libdmstyle.$(IMPLIBEXT) \
+       libdmsynth.$(IMPLIBEXT) \
+       libdmusic.$(IMPLIBEXT) \
+       libdmusic32.$(IMPLIBEXT) \
+       libdplay.$(IMPLIBEXT) \
+       libdplayx.$(IMPLIBEXT) \
+       libdpnet.$(IMPLIBEXT) \
+       libdpnhpast.$(IMPLIBEXT) \
+       libdsound.$(IMPLIBEXT) \
+       libdswave.$(IMPLIBEXT) \
+       libdxdiagn.$(IMPLIBEXT) \
+       libgdi32.$(IMPLIBEXT) \
+       libglu32.$(IMPLIBEXT) \
+       libglut32.$(IMPLIBEXT) \
+       libiccvid.$(IMPLIBEXT) \
+       libicmp.$(IMPLIBEXT) \
+       libimagehlp.$(IMPLIBEXT) \
+       libimm32.$(IMPLIBEXT) \
+       libiphlpapi.$(IMPLIBEXT) \
+       libitss.$(IMPLIBEXT) \
+       libkernel32.$(IMPLIBEXT) \
+       liblz32.$(IMPLIBEXT) \
+       libmapi32.$(IMPLIBEXT) \
+       libmlang.$(IMPLIBEXT) \
+       libmpr.$(IMPLIBEXT) \
+       libmsacm32.$(IMPLIBEXT) \
+       libmsdmo.$(IMPLIBEXT) \
+       libmshtml.$(IMPLIBEXT) \
+       libmsi.$(IMPLIBEXT) \
+       libmsimg32.$(IMPLIBEXT) \
+       libmsnet32.$(IMPLIBEXT) \
+       libmsrle32.$(IMPLIBEXT) \
+       libmsvcrt.$(IMPLIBEXT) \
+       libmsvcrt20.$(IMPLIBEXT) \
+       libmsvcrt40.$(IMPLIBEXT) \
+       libmsvcrtd.$(IMPLIBEXT) \
+       libmsvfw32.$(IMPLIBEXT) \
+       libmsvidc32.$(IMPLIBEXT) \
+       libmswsock.$(IMPLIBEXT) \
+       libnetapi32.$(IMPLIBEXT) \
+       libnewdev.$(IMPLIBEXT) \
+       libntdll.$(IMPLIBEXT) \
+       libodbc32.$(IMPLIBEXT) \
+       libole32.$(IMPLIBEXT) \
+       liboleacc.$(IMPLIBEXT) \
+       liboleaut32.$(IMPLIBEXT) \
+       libolecli32.$(IMPLIBEXT) \
+       liboledlg.$(IMPLIBEXT) \
+       libolepro32.$(IMPLIBEXT) \
+       libolesvr32.$(IMPLIBEXT) \
+       libopengl32.$(IMPLIBEXT) \
+       libpsapi.$(IMPLIBEXT) \
+       libqcap.$(IMPLIBEXT) \
+       libquartz.$(IMPLIBEXT) \
+       librasapi32.$(IMPLIBEXT) \
+       libriched32.$(IMPLIBEXT) \
+       librpcrt4.$(IMPLIBEXT) \
+       librsabase.$(IMPLIBEXT) \
+       libsecur32.$(IMPLIBEXT) \
+       libserialui.$(IMPLIBEXT) \
+       libsetupapi.$(IMPLIBEXT) \
+       libshdocvw.$(IMPLIBEXT) \
+       libshell32.$(IMPLIBEXT) \
+       libshfolder.$(IMPLIBEXT) \
+       libshlwapi.$(IMPLIBEXT) \
+       libsnmpapi.$(IMPLIBEXT) \
+       libsti.$(IMPLIBEXT) \
+       libtapi32.$(IMPLIBEXT) \
+       libttydrv.$(IMPLIBEXT) \
+       libtwain_32.$(IMPLIBEXT) \
+       libunicows.$(IMPLIBEXT) \
+       liburl.$(IMPLIBEXT) \
+       liburlmon.$(IMPLIBEXT) \
+       libuser32.$(IMPLIBEXT) \
+       libuxtheme.$(IMPLIBEXT) \
+       libvdmdbg.$(IMPLIBEXT) \
+       libversion.$(IMPLIBEXT) \
+       libw32skrnl.$(IMPLIBEXT) \
+       libwined3d.$(IMPLIBEXT) \
+       libwinedos.$(IMPLIBEXT) \
+       libwineps.$(IMPLIBEXT) \
+       libwininet.$(IMPLIBEXT) \
+       libwinmm.$(IMPLIBEXT) \
+       libwinnls32.$(IMPLIBEXT) \
+       libwinspool.$(IMPLIBEXT) \
+       libwintab32.$(IMPLIBEXT) \
+       libwintrust.$(IMPLIBEXT) \
+       libwnaspi32.$(IMPLIBEXT) \
+       libwow32.$(IMPLIBEXT) \
+       libws2_32.$(IMPLIBEXT) \
+       libwsock32.$(IMPLIBEXT) \
+       libx11drv.$(IMPLIBEXT) \
        libdxerr8.a \
        libdxerr9.a \
        libdxguid.a \
+       libstrmiids.a \
        libuuid.a
 
+implib: $(IMPORT_LIBS)
+
 libadvapi32.def: advapi32/advapi32.spec.def
        $(RM) $@ && $(LN_S) advapi32/advapi32.spec.def $@
 libadvapi32.a: advapi32/advapi32.spec.def
@@ -1037,6 +1109,11 @@ libamstream.def: amstream/amstream.spec.def
 libamstream.a: amstream/amstream.spec.def
        $(DLLTOOL) -k -l $@ -d amstream/amstream.spec.def
 
+libatl.def: atl/atl.spec.def
+       $(RM) $@ && $(LN_S) atl/atl.spec.def $@
+libatl.a: atl/atl.spec.def
+       $(DLLTOOL) -k -l $@ -d atl/atl.spec.def
+
 libavicap32.def: avicap32/avicap32.spec.def
        $(RM) $@ && $(LN_S) avicap32/avicap32.spec.def $@
 libavicap32.a: avicap32/avicap32.spec.def
@@ -1057,6 +1134,11 @@ libcapi2032.def: capi2032/capi2032.spec.def
 libcapi2032.a: capi2032/capi2032.spec.def
        $(DLLTOOL) -k -l $@ -d capi2032/capi2032.spec.def
 
+libcards.def: cards/cards.spec.def
+       $(RM) $@ && $(LN_S) cards/cards.spec.def $@
+libcards.a: cards/cards.spec.def
+       $(DLLTOOL) -k -l $@ -d cards/cards.spec.def
+
 libcfgmgr32.def: cfgmgr32/cfgmgr32.spec.def
        $(RM) $@ && $(LN_S) cfgmgr32/cfgmgr32.spec.def $@
 libcfgmgr32.a: cfgmgr32/cfgmgr32.spec.def
@@ -1107,11 +1189,26 @@ libd3dim.def: d3dim/d3dim.spec.def
 libd3dim.a: d3dim/d3dim.spec.def
        $(DLLTOOL) -k -l $@ -d d3dim/d3dim.spec.def
 
+libd3drm.def: d3drm/d3drm.spec.def
+       $(RM) $@ && $(LN_S) d3drm/d3drm.spec.def $@
+libd3drm.a: d3drm/d3drm.spec.def
+       $(DLLTOOL) -k -l $@ -d d3drm/d3drm.spec.def
+
 libd3dx8.def: d3dx8/d3dx8.spec.def
        $(RM) $@ && $(LN_S) d3dx8/d3dx8.spec.def $@
 libd3dx8.a: d3dx8/d3dx8.spec.def
        $(DLLTOOL) -k -l $@ -d d3dx8/d3dx8.spec.def
 
+libd3dxof.def: d3dxof/d3dxof.spec.def
+       $(RM) $@ && $(LN_S) d3dxof/d3dxof.spec.def $@
+libd3dxof.a: d3dxof/d3dxof.spec.def
+       $(DLLTOOL) -k -l $@ -d d3dxof/d3dxof.spec.def
+
+libdbghelp.def: dbghelp/dbghelp.spec.def
+       $(RM) $@ && $(LN_S) dbghelp/dbghelp.spec.def $@
+libdbghelp.a: dbghelp/dbghelp.spec.def
+       $(DLLTOOL) -k -l $@ -d dbghelp/dbghelp.spec.def
+
 libdciman32.def: dciman32/dciman32.spec.def
        $(RM) $@ && $(LN_S) dciman32/dciman32.spec.def $@
 libdciman32.a: dciman32/dciman32.spec.def
@@ -1192,6 +1289,11 @@ libdplayx.def: dplayx/dplayx.spec.def
 libdplayx.a: dplayx/dplayx.spec.def
        $(DLLTOOL) -k -l $@ -d dplayx/dplayx.spec.def
 
+libdpnet.def: dpnet/dpnet.spec.def
+       $(RM) $@ && $(LN_S) dpnet/dpnet.spec.def $@
+libdpnet.a: dpnet/dpnet.spec.def
+       $(DLLTOOL) -k -l $@ -d dpnet/dpnet.spec.def
+
 libdpnhpast.def: dpnhpast/dpnhpast.spec.def
        $(RM) $@ && $(LN_S) dpnhpast/dpnhpast.spec.def $@
 libdpnhpast.a: dpnhpast/dpnhpast.spec.def
@@ -1207,6 +1309,11 @@ libdswave.def: dswave/dswave.spec.def
 libdswave.a: dswave/dswave.spec.def
        $(DLLTOOL) -k -l $@ -d dswave/dswave.spec.def
 
+libdxdiagn.def: dxdiagn/dxdiagn.spec.def
+       $(RM) $@ && $(LN_S) dxdiagn/dxdiagn.spec.def $@
+libdxdiagn.a: dxdiagn/dxdiagn.spec.def
+       $(DLLTOOL) -k -l $@ -d dxdiagn/dxdiagn.spec.def
+
 libgdi32.def: gdi/gdi32.spec.def
        $(RM) $@ && $(LN_S) gdi/gdi32.spec.def $@
 libgdi32.a: gdi/gdi32.spec.def
@@ -1247,6 +1354,11 @@ libiphlpapi.def: iphlpapi/iphlpapi.spec.def
 libiphlpapi.a: iphlpapi/iphlpapi.spec.def
        $(DLLTOOL) -k -l $@ -d iphlpapi/iphlpapi.spec.def
 
+libitss.def: itss/itss.spec.def
+       $(RM) $@ && $(LN_S) itss/itss.spec.def $@
+libitss.a: itss/itss.spec.def
+       $(DLLTOOL) -k -l $@ -d itss/itss.spec.def
+
 libkernel32.def: kernel/kernel32.spec.def
        $(RM) $@ && $(LN_S) kernel/kernel32.spec.def $@
 libkernel32.a: kernel/kernel32.spec.def
@@ -1262,6 +1374,11 @@ libmapi32.def: mapi32/mapi32.spec.def
 libmapi32.a: mapi32/mapi32.spec.def
        $(DLLTOOL) -k -l $@ -d mapi32/mapi32.spec.def
 
+libmlang.def: mlang/mlang.spec.def
+       $(RM) $@ && $(LN_S) mlang/mlang.spec.def $@
+libmlang.a: mlang/mlang.spec.def
+       $(DLLTOOL) -k -l $@ -d mlang/mlang.spec.def
+
 libmpr.def: mpr/mpr.spec.def
        $(RM) $@ && $(LN_S) mpr/mpr.spec.def $@
 libmpr.a: mpr/mpr.spec.def
@@ -1517,6 +1634,11 @@ libuxtheme.def: uxtheme/uxtheme.spec.def
 libuxtheme.a: uxtheme/uxtheme.spec.def
        $(DLLTOOL) -k -l $@ -d uxtheme/uxtheme.spec.def
 
+libvdmdbg.def: vdmdbg/vdmdbg.spec.def
+       $(RM) $@ && $(LN_S) vdmdbg/vdmdbg.spec.def $@
+libvdmdbg.a: vdmdbg/vdmdbg.spec.def
+       $(DLLTOOL) -k -l $@ -d vdmdbg/vdmdbg.spec.def
+
 libversion.def: version/version.spec.def
        $(RM) $@ && $(LN_S) version/version.spec.def $@
 libversion.a: version/version.spec.def
@@ -1599,10 +1721,12 @@ libx11drv.a: x11drv/x11drv.spec.def
 
 advapi32/advapi32.spec.def: $(WINEBUILD)
 amstream/amstream.spec.def: $(WINEBUILD)
+atl/atl.spec.def: $(WINEBUILD)
 avicap32/avicap32.spec.def: $(WINEBUILD)
 avifil32/avifil32.spec.def: $(WINEBUILD)
 cabinet/cabinet.spec.def: $(WINEBUILD)
 capi2032/capi2032.spec.def: $(WINEBUILD)
+cards/cards.spec.def: $(WINEBUILD)
 cfgmgr32/cfgmgr32.spec.def: $(WINEBUILD)
 comcat/comcat.spec.def: $(WINEBUILD)
 comctl32/comctl32.spec.def: $(WINEBUILD)
@@ -1613,7 +1737,10 @@ ctl3d/ctl3d32.spec.def: $(WINEBUILD)
 d3d8/d3d8.spec.def: $(WINEBUILD)
 d3d9/d3d9.spec.def: $(WINEBUILD)
 d3dim/d3dim.spec.def: $(WINEBUILD)
+d3drm/d3drm.spec.def: $(WINEBUILD)
 d3dx8/d3dx8.spec.def: $(WINEBUILD)
+d3dxof/d3dxof.spec.def: $(WINEBUILD)
+dbghelp/dbghelp.spec.def: $(WINEBUILD)
 dciman32/dciman32.spec.def: $(WINEBUILD)
 ddraw/ddraw.spec.def: $(WINEBUILD)
 devenum/devenum.spec.def: $(WINEBUILD)
@@ -1630,9 +1757,11 @@ dmusic/dmusic.spec.def: $(WINEBUILD)
 dmusic32/dmusic32.spec.def: $(WINEBUILD)
 dplay/dplay.spec.def: $(WINEBUILD)
 dplayx/dplayx.spec.def: $(WINEBUILD)
+dpnet/dpnet.spec.def: $(WINEBUILD)
 dpnhpast/dpnhpast.spec.def: $(WINEBUILD)
 dsound/dsound.spec.def: $(WINEBUILD)
 dswave/dswave.spec.def: $(WINEBUILD)
+dxdiagn/dxdiagn.spec.def: $(WINEBUILD)
 gdi/gdi32.spec.def: $(WINEBUILD)
 glu32/glu32.spec.def: $(WINEBUILD)
 glut32/glut32.spec.def: $(WINEBUILD)
@@ -1641,9 +1770,11 @@ icmp/icmp.spec.def: $(WINEBUILD)
 imagehlp/imagehlp.spec.def: $(WINEBUILD)
 imm32/imm32.spec.def: $(WINEBUILD)
 iphlpapi/iphlpapi.spec.def: $(WINEBUILD)
+itss/itss.spec.def: $(WINEBUILD)
 kernel/kernel32.spec.def: $(WINEBUILD)
 lzexpand/lz32.spec.def: $(WINEBUILD)
 mapi32/mapi32.spec.def: $(WINEBUILD)
+mlang/mlang.spec.def: $(WINEBUILD)
 mpr/mpr.spec.def: $(WINEBUILD)
 msacm/msacm32.spec.def: $(WINEBUILD)
 msdmo/msdmo.spec.def: $(WINEBUILD)
@@ -1695,6 +1826,7 @@ url/url.spec.def: $(WINEBUILD)
 urlmon/urlmon.spec.def: $(WINEBUILD)
 user/user32.spec.def: $(WINEBUILD)
 uxtheme/uxtheme.spec.def: $(WINEBUILD)
+vdmdbg/vdmdbg.spec.def: $(WINEBUILD)
 version/version.spec.def: $(WINEBUILD)
 win32s/w32skrnl.spec.def: $(WINEBUILD)
 wined3d/wined3d.spec.def: $(WINEBUILD)
@@ -1712,17 +1844,19 @@ winsock/ws2_32.spec.def: $(WINEBUILD)
 wsock32/wsock32.spec.def: $(WINEBUILD)
 x11drv/x11drv.spec.def: $(WINEBUILD)
 
-$(BUILDSUBDIRS): $(ALL_IMPORT_LIBS)
-$(INSTALLSUBDIRS:%=%/__install__): $(ALL_IMPORT_LIBS)
+$(BUILDSUBDIRS): $(IMPORT_LIBS)
+$(INSTALLSUBDIRS:%=%/__install__): $(IMPORT_LIBS)
 
 # Map library name to the corresponding directory
 
 advapi32/advapi32.dll.so: advapi32
 amstream/amstream.dll.so: amstream
+atl/atl.dll.so: atl
 avicap32/avicap32.dll.so: avicap32
 avifil32/avifil32.dll.so: avifil32
 cabinet/cabinet.dll.so: cabinet
 capi2032/capi2032.dll.so: capi2032
+cards/cards.dll.so: cards
 cfgmgr32/cfgmgr32.dll.so: cfgmgr32
 comcat/comcat.dll.so: comcat
 comctl32/comctl32.dll.so: comctl32
@@ -1733,7 +1867,10 @@ ctl3d/ctl3d32.dll.so: ctl3d
 d3d8/d3d8.dll.so: d3d8
 d3d9/d3d9.dll.so: d3d9
 d3dim/d3dim.dll.so: d3dim
+d3drm/d3drm.dll.so: d3drm
 d3dx8/d3dx8.dll.so: d3dx8
+d3dxof/d3dxof.dll.so: d3dxof
+dbghelp/dbghelp.dll.so: dbghelp
 dciman32/dciman32.dll.so: dciman32
 ddraw/ddraw.dll.so: ddraw
 devenum/devenum.dll.so: devenum
@@ -1750,12 +1887,15 @@ dmusic/dmusic.dll.so: dmusic
 dmusic32/dmusic32.dll.so: dmusic32
 dplay/dplay.dll.so: dplay
 dplayx/dplayx.dll.so: dplayx
+dpnet/dpnet.dll.so: dpnet
 dpnhpast/dpnhpast.dll.so: dpnhpast
 dsound/dsound.dll.so: dsound
 dswave/dswave.dll.so: dswave
+dxdiagn/dxdiagn.dll.so: dxdiagn
 gdi/gdi32.dll.so: gdi
 glu32/glu32.dll.so: glu32
 glut32/glut32.dll.so: glut32
+hhctrl.ocx/hhctrl.ocx.so: hhctrl.ocx
 iccvid/iccvid.dll.so: iccvid
 icmp/icmp.dll.so: icmp
 ifsmgr.vxd/ifsmgr.vxd.so: ifsmgr.vxd
@@ -1763,6 +1903,7 @@ msacm/imaadp32/imaadp32.acm.so: msacm/imaadp32
 imagehlp/imagehlp.dll.so: imagehlp
 imm32/imm32.dll.so: imm32
 iphlpapi/iphlpapi.dll.so: iphlpapi
+itss/itss.dll.so: itss
 winmm/joystick/joystick.drv.so: winmm/joystick
 kernel/kernel32.dll.so: kernel
 lzexpand/lz32.dll.so: lzexpand
@@ -1773,6 +1914,7 @@ winmm/mcicda/mcicda.drv.so: winmm/mcicda
 winmm/mciseq/mciseq.drv.so: winmm/mciseq
 winmm/mciwave/mciwave.drv.so: winmm/mciwave
 winmm/midimap/midimap.drv.so: winmm/midimap
+mlang/mlang.dll.so: mlang
 mmdevldr.vxd/mmdevldr.vxd.so: mmdevldr.vxd
 monodebg.vxd/monodebg.vxd.so: monodebg.vxd
 mpr/mpr.dll.so: mpr
@@ -1831,6 +1973,7 @@ urlmon/urlmon.dll.so: urlmon
 user/user32.dll.so: user
 uxtheme/uxtheme.dll.so: uxtheme
 vdhcp.vxd/vdhcp.vxd.so: vdhcp.vxd
+vdmdbg/vdmdbg.dll.so: vdmdbg
 version/version.dll.so: version
 vmm.vxd/vmm.vxd.so: vmm.vxd
 vnbt.vxd/vnbt.vxd.so: vnbt.vxd
@@ -1862,6 +2005,7 @@ x11drv/x11drv.dll.so: x11drv
 dxerr8/libdxerr8.a: dxerr8
 dxerr9/libdxerr9.a: dxerr9
 dxguid/libdxguid.a: dxguid
+strmiids/libstrmiids.a: strmiids
 uuid/libuuid.a: uuid
 
 # Rules for auto documentation
@@ -1885,18 +2029,18 @@ doc-sgml: $(SUBDIRS:%=%/__doc_sgml__)
 
 # Misc rules
 
-install install-dev:: $(ALL_IMPORT_LIBS)
+install install-dev:: $(IMPORT_LIBS)
        $(MKINSTALLDIRS) $(dlldir)
-       for f in $(ALL_IMPORT_LIBS); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done
+       for f in $(IMPORT_LIBS); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done
 
 install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
 
 uninstall::
-       $(RM) $(ALL_IMPORT_LIBS:%=$(dlldir)/%)
+       -cd $(dlldir) && $(RM) $(IMPORT_LIBS)
        -rmdir $(dlldir)
 
 clean::
-       $(RM) $(ALL_IMPORT_LIBS) $(SYMLINKS)
+       $(RM) $(IMPORT_LIBS) $(SYMLINKS)
 
 check test:: $(BUILDSUBDIRS:%=%/__test__)