modified tools/rbuild/backend/mingw/modulehandler.cpp
authorKJK::Hyperion <hackbunny@reactos.org>
Tue, 21 Oct 2008 13:51:49 +0000 (13:51 +0000)
committerKJK::Hyperion <hackbunny@reactos.org>
Tue, 21 Oct 2008 13:51:49 +0000 (13:51 +0000)
modified   tools/rbuild/backend/mingw/modulehandler.h
modified   tools/rbuild/module.cpp
   Split rules for .spec files as input files vs import libraries. .spec files can now be specified independently as <file>s (to generate and compile a .stubs.c file) and <importlibrary> (to generate and compile a .spec.def file)
   .spec files are now specified in <importlibrary>s directly (instead of pointing to the non-existing, generated .spec.def file. Whose idea was that? sounds like the doing of Arch Blackmann)
   Allow multiple modules to share a single .spec file without using <importlibrary base="...">
   Allow static libraries to use .spec files in <importlibrary>
   Emit comments in makefile.auto so rules can be traced back to the code that generated them

deleted    lib/debugsup/debugsup-ntos.def
added      lib/debugsup/debugsup-ntos.spec
modified   lib/debugsup/debugsup.rbuild
   .def -> .spec

<<hundreds of rbuild files>>
   Remove <file> entry for spec file if there are no stubs to compile
   .spec.def -> .spec in <importlibrary> entries

Soon: making all keyboard layouts use a single .spec file
Dedicated to: Samuel SerapiĆ³n, Stefan Ginsberg, and all the fellow team members who'll have an aneurysm at this commit

See issue #3746 for more details.

svn path=/trunk/; revision=36870

248 files changed:
reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
reactos/base/applications/regedit/clb/clb.rbuild
reactos/base/applications/screensavers/3dtext/3dtext.rbuild
reactos/base/applications/screensavers/logon/logon.rbuild
reactos/dll/cpl/access/access.rbuild
reactos/dll/cpl/console/console.rbuild
reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
reactos/dll/cpl/mmsys/mmsys.rbuild
reactos/dll/directx/d3d9/d3d9.rbuild
reactos/dll/directx/devenum/devenum.rbuild
reactos/dll/directx/dinput/dinput.rbuild
reactos/dll/directx/dinput8/dinput8.rbuild
reactos/dll/directx/dplay/dplay.rbuild
reactos/dll/directx/dplayx/dplayx.rbuild
reactos/dll/directx/dsound/dsound.rbuild
reactos/dll/directx/dxdiagn/dxdiagn.rbuild
reactos/dll/directx/ksproxy/ksproxy.rbuild
reactos/dll/directx/msdmo/msdmo.rbuild
reactos/dll/directx/qedit/qedit.rbuild
reactos/dll/directx/quartz/quartz.rbuild
reactos/dll/directx/wine/d3d8/d3d8.rbuild
reactos/dll/directx/wine/d3d9/d3d9.rbuild
reactos/dll/keyboard/kbda1/kbda1.rbuild
reactos/dll/keyboard/kbda2/kbda2.rbuild
reactos/dll/keyboard/kbda3/kbda3.rbuild
reactos/dll/keyboard/kbdal/kbdal.rbuild
reactos/dll/keyboard/kbdarme/kbdarme.rbuild
reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
reactos/dll/keyboard/kbdaze/kbdaze.rbuild
reactos/dll/keyboard/kbdazel/kbdazel.rbuild
reactos/dll/keyboard/kbdbe/kbdbe.rbuild
reactos/dll/keyboard/kbdbga/kbdbga.rbuild
reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
reactos/dll/keyboard/kbdblr/kbdblr.rbuild
reactos/dll/keyboard/kbdbr/kbdbr.rbuild
reactos/dll/keyboard/kbdbur/kbdbur.rbuild
reactos/dll/keyboard/kbdcan/kbdcan.rbuild
reactos/dll/keyboard/kbdcr/kbdcr.rbuild
reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
reactos/dll/keyboard/kbdda/kbdda.rbuild
reactos/dll/keyboard/kbddv/kbddv.rbuild
reactos/dll/keyboard/kbdes/kbdes.rbuild
reactos/dll/keyboard/kbdest/kbdest.rbuild
reactos/dll/keyboard/kbdfc/kbdfc.rbuild
reactos/dll/keyboard/kbdfi/kbdfi.rbuild
reactos/dll/keyboard/kbdfr/kbdfr.rbuild
reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
reactos/dll/keyboard/kbdgr/kbdgr.rbuild
reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
reactos/dll/keyboard/kbdhe/kbdhe.rbuild
reactos/dll/keyboard/kbdheb/kbdheb.rbuild
reactos/dll/keyboard/kbdhu/kbdhu.rbuild
reactos/dll/keyboard/kbdic/kbdic.rbuild
reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
reactos/dll/keyboard/kbdinben/kbdinben.rbuild
reactos/dll/keyboard/kbdindev/kbdindev.rbuild
reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
reactos/dll/keyboard/kbdir/kbdir.rbuild
reactos/dll/keyboard/kbdit/kbdit.rbuild
reactos/dll/keyboard/kbdja/kbdja.rbuild
reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
reactos/dll/keyboard/kbdko/kbdko.rbuild
reactos/dll/keyboard/kbdla/kbdla.rbuild
reactos/dll/keyboard/kbdlt/kbdlt.rbuild
reactos/dll/keyboard/kbdlv/kbdlv.rbuild
reactos/dll/keyboard/kbdmac/kbdmac.rbuild
reactos/dll/keyboard/kbdne/kbdne.rbuild
reactos/dll/keyboard/kbdno/kbdno.rbuild
reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
reactos/dll/keyboard/kbdpo/kbdpo.rbuild
reactos/dll/keyboard/kbdro/kbdro.rbuild
reactos/dll/keyboard/kbdru/kbdru.rbuild
reactos/dll/keyboard/kbdru1/kbdru1.rbuild
reactos/dll/keyboard/kbdsg/kbdsg.rbuild
reactos/dll/keyboard/kbdsk/kbdsk.rbuild
reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
reactos/dll/keyboard/kbdsw/kbdsw.rbuild
reactos/dll/keyboard/kbdtat/kbdtat.rbuild
reactos/dll/keyboard/kbdth0/kbdth0.rbuild
reactos/dll/keyboard/kbdth1/kbdth1.rbuild
reactos/dll/keyboard/kbdth2/kbdth2.rbuild
reactos/dll/keyboard/kbdth3/kbdth3.rbuild
reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
reactos/dll/keyboard/kbduk/kbduk.rbuild
reactos/dll/keyboard/kbdur/kbdur.rbuild
reactos/dll/keyboard/kbdurs/kbdurs.rbuild
reactos/dll/keyboard/kbdus/kbdus.rbuild
reactos/dll/keyboard/kbdusa/kbdusa.rbuild
reactos/dll/keyboard/kbdusl/kbdusl.rbuild
reactos/dll/keyboard/kbdusr/kbdusr.rbuild
reactos/dll/keyboard/kbdusx/kbdusx.rbuild
reactos/dll/keyboard/kbduzb/kbduzb.rbuild
reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
reactos/dll/keyboard/kbdycc/kbdycc.rbuild
reactos/dll/keyboard/kbdycl/kbdycl.rbuild
reactos/dll/shellext/deskadp/deskadp.rbuild
reactos/dll/shellext/deskmon/deskmon.rbuild
reactos/dll/shellext/fontext/fontext.rbuild
reactos/dll/win32/acledit/acledit.rbuild
reactos/dll/win32/aclui/aclui.rbuild
reactos/dll/win32/advpack/advpack.rbuild
reactos/dll/win32/atl/atl.rbuild
reactos/dll/win32/avifil32/avifil32.rbuild
reactos/dll/win32/browseui/browseui.rbuild
reactos/dll/win32/cabinet/cabinet.rbuild
reactos/dll/win32/cards/cards.rbuild
reactos/dll/win32/clusapi/clusapi.rbuild
reactos/dll/win32/comcat/comcat.rbuild
reactos/dll/win32/comctl32/comctl32.rbuild
reactos/dll/win32/comdlg32/comdlg32.rbuild
reactos/dll/win32/compstui/compstui.rbuild
reactos/dll/win32/credui/credui.rbuild
reactos/dll/win32/crypt32/crypt32.rbuild
reactos/dll/win32/cryptdll/cryptdll.rbuild
reactos/dll/win32/cryptnet/cryptnet.rbuild
reactos/dll/win32/cryptui/cryptui.rbuild
reactos/dll/win32/dbghelp/dbghelp.rbuild
reactos/dll/win32/dciman32/dciman32.rbuild
reactos/dll/win32/devmgr/devmgr.rbuild
reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
reactos/dll/win32/fusion/fusion.rbuild
reactos/dll/win32/gdiplus/gdiplus.rbuild
reactos/dll/win32/getuname/getuname.rbuild
reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
reactos/dll/win32/hlink/hlink.rbuild
reactos/dll/win32/icmp/icmp.rbuild
reactos/dll/win32/imagehlp/imagehlp.rbuild
reactos/dll/win32/imm32/imm32.rbuild
reactos/dll/win32/inetcomm/inetcomm.rbuild
reactos/dll/win32/inetmib1/inetmib1.rbuild
reactos/dll/win32/iphlpapi/iphlpapi.rbuild
reactos/dll/win32/jscript/jscript.rbuild
reactos/dll/win32/lpk/lpk.rbuild
reactos/dll/win32/lz32/lz32.rbuild
reactos/dll/win32/mapi32/mapi32.rbuild
reactos/dll/win32/mlang/mlang.rbuild
reactos/dll/win32/mmdrv/mmdrv.rbuild
reactos/dll/win32/modemui/modemui.rbuild
reactos/dll/win32/mpr/mpr.rbuild
reactos/dll/win32/mprapi/mprapi.rbuild
reactos/dll/win32/msacm32/msacm32.rbuild
reactos/dll/win32/mscoree/mscoree.rbuild
reactos/dll/win32/msgina/msgina.rbuild
reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
reactos/dll/win32/mshtml/mshtml.rbuild
reactos/dll/win32/msi/msi.rbuild
reactos/dll/win32/msimg32/msimg32.rbuild
reactos/dll/win32/mstask/mstask.rbuild
reactos/dll/win32/msvcrt20/msvcrt20.rbuild
reactos/dll/win32/msvcrt40/msvcrt40.rbuild
reactos/dll/win32/msvfw32/msvfw32.rbuild
reactos/dll/win32/msxml3/msxml3.rbuild
reactos/dll/win32/nddeapi/nddeapi.rbuild
reactos/dll/win32/netapi32/netapi32.rbuild
reactos/dll/win32/netcfgx/netcfgx.rbuild
reactos/dll/win32/netid/netid.rbuild
reactos/dll/win32/netshell/netshell.rbuild
reactos/dll/win32/newdev/newdev.rbuild
reactos/dll/win32/ntdsapi/ntdsapi.rbuild
reactos/dll/win32/ntmarta/ntmarta.rbuild
reactos/dll/win32/objsel/objsel.rbuild
reactos/dll/win32/odbc32/odbc32.rbuild
reactos/dll/win32/odbccp32/odbccp32.rbuild
reactos/dll/win32/ole32/ole32.rbuild
reactos/dll/win32/oleacc/oleacc.rbuild
reactos/dll/win32/oleaut32/oleaut32.rbuild
reactos/dll/win32/oledlg/oledlg.rbuild
reactos/dll/win32/olepro32/olepro32.rbuild
reactos/dll/win32/pdh/pdh.rbuild
reactos/dll/win32/powrprof/powrprof.rbuild
reactos/dll/win32/printui/printui.rbuild
reactos/dll/win32/pstorec/pstorec.rbuild
reactos/dll/win32/rasapi32/rasapi32.rbuild
reactos/dll/win32/rasdlg/rasdlg.rbuild
reactos/dll/win32/rasman/rasman.rbuild
reactos/dll/win32/riched20/riched20.rbuild
reactos/dll/win32/riched32/riched32.rbuild
reactos/dll/win32/rpcrt4/rpcrt4.rbuild
reactos/dll/win32/rsabase/rsabase.rbuild
reactos/dll/win32/rsaenh/rsaenh.rbuild
reactos/dll/win32/samsrv/samsrv.rbuild
reactos/dll/win32/schannel/schannel.rbuild
reactos/dll/win32/sensapi/sensapi.rbuild
reactos/dll/win32/serialui/serialui.rbuild
reactos/dll/win32/setupapi/setupapi.rbuild
reactos/dll/win32/sfc/sfc.rbuild
reactos/dll/win32/sfc_os/sfc_os.rbuild
reactos/dll/win32/shdocvw/shdocvw.rbuild
reactos/dll/win32/shell32/shell32.rbuild
reactos/dll/win32/shfolder/shfolder.rbuild
reactos/dll/win32/shimgvw/shimgvw.rbuild
reactos/dll/win32/shlwapi/shlwapi.rbuild
reactos/dll/win32/snmpapi/snmpapi.rbuild
reactos/dll/win32/stdole2.tlb/stdole2.rbuild
reactos/dll/win32/stdole32.tlb/stdole32.rbuild
reactos/dll/win32/sxs/sxs.rbuild
reactos/dll/win32/tapi32/tapi32.rbuild
reactos/dll/win32/urlmon/urlmon.rbuild
reactos/dll/win32/usp10/usp10.rbuild
reactos/dll/win32/uxtheme/uxtheme.rbuild
reactos/dll/win32/vdmdbg/vdmdbg.rbuild
reactos/dll/win32/version/version.rbuild
reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
reactos/dll/win32/winhttp/winhttp.rbuild
reactos/dll/win32/wininet/wininet.rbuild
reactos/dll/win32/winmm/midimap/midimap.rbuild
reactos/dll/win32/winmm/wavemap/wavemap.rbuild
reactos/dll/win32/winmm/winmm.rbuild
reactos/dll/win32/wintrust/wintrust.rbuild
reactos/dll/win32/wldap32/wldap32.rbuild
reactos/dll/win32/wshtcpip/wshtcpip.rbuild
reactos/dll/win32/wtsapi32/wtsapi32.rbuild
reactos/drivers/base/bootvid/bootvid.rbuild
reactos/drivers/base/kdcom/kdcom.rbuild
reactos/drivers/directx/dxapi/dxapi.rbuild
reactos/drivers/directx/dxg/dxg.rbuild
reactos/drivers/directx/dxgthk/dxgthk.rbuild
reactos/drivers/ksfilter/ks/ks.rbuild
reactos/drivers/network/tcpip/tcpip.rbuild
reactos/drivers/storage/class/class2/class2.rbuild
reactos/drivers/storage/ide/pciidex/pciidex.rbuild
reactos/drivers/storage/port/diskdump/diskdump.rbuild
reactos/drivers/storage/scsiport/scsiport.rbuild
reactos/drivers/usb/usbd/usbd.rbuild
reactos/drivers/video/displays/framebuf/framebuf.rbuild
reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
reactos/drivers/video/displays/vga/vgaddi.rbuild
reactos/drivers/video/videoprt/videoprt.rbuild
reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
reactos/drivers/wmi/wmilib.rbuild
reactos/hal/hal/hal.rbuild
reactos/hal/halarm/up/halup.rbuild
reactos/hal/halx86/halmp.rbuild
reactos/hal/halx86/halup.rbuild
reactos/hal/halx86/halxbox.rbuild
reactos/lib/debugsup/debugsup-ntos.def [deleted file]
reactos/lib/debugsup/debugsup-ntos.spec [new file with mode: 0644]
reactos/lib/debugsup/debugsup.rbuild
reactos/ntoskrnl/ntoskrnl-generic.rbuild
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
reactos/tools/rbuild/backend/mingw/modulehandler.h
reactos/tools/rbuild/module.cpp

index c84b3ed..bf0ef3b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
-       <importlibrary definition="kbsdll.spec.def" />
+       <importlibrary definition="kbsdll.spec" />
        <include base="kbsdll">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
@@ -11,5 +11,4 @@
        <library>comctl32</library>
        <file>kbsdll.c</file>
        <file>kbsdll.rc</file>
-       <file>kbsdll.spec</file>
 </module>
index 2e8d86a..f708661 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes">
-       <importlibrary definition="clb.spec.def" />
+       <importlibrary definition="clb.spec" />
        <include base="clb">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
@@ -13,6 +13,5 @@
        <library>comctl32</library>
        <file>clb.c</file>
        <file>clb.rc</file>
-       <file>clb.spec</file>
        <pch>precomp.h</pch>
 </module>
index 03e2f50..365f917 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes">
-       <importlibrary definition="3dtext.spec.def" />
+       <importlibrary definition="3dtext.spec" />
        <library>scrnsave</library>
        <library>kernel32</library>
        <library>user32</library>
@@ -13,7 +13,6 @@
        <file>3dtext.c</file>
        <file>settings.c</file>
        <file>rsrc.rc</file>
-       <file>3dtext.spec</file>
 
        <metadata description="3D text OpenGL screensaver" />
 </module>
index 32085fb..6176f16 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
-       <importlibrary definition="logon.spec.def" />
+       <importlibrary definition="logon.spec" />
        <include base="logon">.</include>
        <library>scrnsave</library>
        <library>kernel32</library>
@@ -12,5 +12,4 @@
 
        <file>logon.c</file>
        <file>logon.rc</file>
-       <file>logon.spec</file>
 </module>
index 825eef4..2a90095 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
-       <importlibrary definition="access.spec.def" />
+       <importlibrary definition="access.spec" />
        <include base="access">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
@@ -18,5 +18,4 @@
        <file>mouse.c</file>
        <file>sound.c</file>
        <file>access.rc</file>
-       <file>access.spec</file>
 </module>
index 7fce920..7531fb3 100644 (file)
@@ -1,5 +1,5 @@
 <module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
-       <importlibrary definition="console.spec.def" />
+       <importlibrary definition="console.spec" />
        <include base="console">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
@@ -13,6 +13,5 @@
        <file>layout.c</file>
        <file>colors.c</file>
        <file>console.rc</file>
-       <file>console.spec</file>
        <pch>console.h</pch>
 </module>
index 628c101..65a4ad1 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes">
-       <importlibrary definition="hdwwiz.spec.def" />
+       <importlibrary definition="hdwwiz.spec" />
        <include base="hdwwiz">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
@@ -9,5 +9,4 @@
        <library>kernel32</library>
        <file>hdwwiz.c</file>
        <file>hdwwiz.rc</file>
-       <file>hdwwiz.spec</file>
 </module>
index 80d234d..4a6ffc3 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes">
-       <importlibrary definition="mmsys.spec.def" />
+       <importlibrary definition="mmsys.spec" />
        <include base="mmsys">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
@@ -21,5 +21,4 @@
        <file>audio.c</file>
        <file>voice.c</file>
        <file>mmsys.rc</file>
-       <file>mmsys.spec</file>
 </module>
index 61369d6..6d273c7 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll" baseaddress="0x4fdd0000">
-       <importlibrary definition="d3d9.spec.def" />
+       <importlibrary definition="d3d9.spec" />
 
        <library>advapi32</library>
        <library>kernel32</library>
@@ -31,5 +31,4 @@
        <file>device.c</file>
        <file>format.c</file>
        <file>d3d9.rc</file>
-       <file>d3d9.spec</file>
 </module>
index 98166aa..85536a2 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="devenum.spec.def" />
+       <importlibrary definition="devenum.spec" />
        <include base="devenum">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -25,5 +25,4 @@
        <file>factory.c</file>
        <file>mediacatenum.c</file>
        <file>parsedisplayname.c</file>
-       <file>devenum.spec</file>
 </module>
index 9ec004c..9d363d5 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dinput.spec.def" />
+       <importlibrary definition="dinput.spec" />
        <include base="dinput">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -27,5 +27,4 @@
        <file>keyboard.c</file>
        <file>mouse.c</file>
        <file>regsvr.c</file>
-       <file>dinput.spec</file>
 </module>
index 539b927..6f10621 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dinput8.spec.def" />
+       <importlibrary definition="dinput8.spec" />
        <include base="dinput8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -20,5 +20,4 @@
        <library>dinput</library>
        <file>version.rc</file>
        <file>dinput8_main.c</file>
-       <file>dinput8.spec</file>
 </module>
index 81144ba..337fa39 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll" unicode="yes">
-       <importlibrary definition="dplay.spec.def" />
+       <importlibrary definition="dplay.spec" />
        <include base="dinput8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -19,5 +19,4 @@
        <library>dinput</library>
        <file>version.rc</file>
        <file>dplay_main.c</file>
-       <file>dplay.spec</file>
 </module>
index fb4bde9..be38932 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true" unicode="yes">
        <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
-       <importlibrary definition="dplayx.spec.def" />
+       <importlibrary definition="dplayx.spec" />
        <include base="dplayx">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -28,5 +28,4 @@
        <file>lobbysp.c</file>
        <file>name_server.c</file>
        <file>regsvr.c</file>
-       <file>dplayx.spec</file>
 </module>
index 3053ec1..6486281 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll" allowwarnings ="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dsound.spec.def" />
+       <importlibrary definition="dsound.spec" />
        <include base="dsound">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -35,5 +35,4 @@
                <file>dxroslayer.c</file>
                <file>getguidfromstring.c</file>
        </directory>
-       <file>dsound.spec</file>
 </module>
index df69d27..1155eba 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dxdiagn.spec.def" />
+       <importlibrary definition="dxdiagn.spec" />
        <include base="dxdiagn">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -22,5 +22,4 @@
        <file>dxdiag_main.c</file>
        <file>provider.c</file>
        <file>regsvr.c</file>
-       <file>dxdiagn.spec</file>
 </module>
index fddad2c..d5b065e 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true">
-       <importlibrary definition="ksproxy.spec.def" />
+       <importlibrary definition="ksproxy.spec" />
        <include base="ksproxy">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
@@ -11,6 +11,5 @@
        <library>ntdll</library>
        <file>ksproxy.c</file>
        <file>ksproxy.rc</file>
-       <file>ksproxy.spec</file>
 </module>
 </group>
index 57670d0..a74951d 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true">
-       <importlibrary definition="msdmo.spec.def" />
+       <importlibrary definition="msdmo.spec" />
        <include base="msdmo">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
index 6f2363b..30d54b2 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true">
-       <importlibrary definition="qedit.spec.def" />
+       <importlibrary definition="qedit.spec" />
        <include base="qedit">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
@@ -11,6 +11,5 @@
        <library>ntdll</library>
        <file>qedit.c</file>
        <file>qedit.rc</file>
-       <file>qedit.spec</file>
 </module>
 </group>
index 831eef5..a482805 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="quartz.spec.def" />
+       <importlibrary definition="quartz.spec" />
        <include base="quartz">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
index 65c8232..fb81839 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true" unicode="yes">
-       <importlibrary definition="d3d8.spec.def" />
+       <importlibrary definition="d3d8.spec" />
        <include base="d3d8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -37,5 +37,4 @@
        <file>volume.c</file>
        <file>volumetexture.c</file>
        <file>version.rc</file>
-       <file>d3d8.spec</file>
 </module>
index e6a43e3..5c333aa 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true" unicode="yes">
-       <importlibrary definition="d3d9.spec.def" />
+       <importlibrary definition="d3d9.spec" />
        <include base="d3d9">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
index f4535a8..0786e9f 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda1.dll" allowwarnings="true">
-       <importlibrary definition="kbda1.spec.def" />
+       <importlibrary definition="kbda1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbda1.c</file>
        <file>kbda1.rc</file>
-       <file>kbda1.spec</file>
 </module>
index 13c311d..b173ed1 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda2.dll" allowwarnings="true">
-       <importlibrary definition="kbda2.spec.def" />
+       <importlibrary definition="kbda2.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbda2.c</file>
        <file>kbda2.rc</file>
-       <file>kbda2.spec</file>
 </module>
index b3d213c..6082e66 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda3.dll" allowwarnings="true">
-       <importlibrary definition="kbda3.spec.def" />
+       <importlibrary definition="kbda3.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbda3.c</file>
        <file>kbda3.rc</file>
-       <file>kbda3.spec</file>
 </module>
index e45eb3d..bac4abe 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true">
-       <importlibrary definition="kbdal.spec.def" />
+       <importlibrary definition="kbdal.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdal.c</file>
        <file>kbdal.rc</file>
-       <file>kbdal.spec</file>
 </module>
index 008efd4..fd7bdd8 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarme" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarme.dll" allowwarnings="true">
-       <importlibrary definition="kbdarme.spec.def" />
+       <importlibrary definition="kbdarme.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdarme.c</file>
        <file>kbdarme.rc</file>
-       <file>kbdarme.spec</file>
 </module>
index 3738383..56df98d 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarmw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarmw.dll" allowwarnings="true">
-       <importlibrary definition="kbdarmw.spec.def" />
+       <importlibrary definition="kbdarmw.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdarmw.c</file>
        <file>kbdarmw.rc</file>
-       <file>kbdarmw.spec</file>
 </module>
index fdeeb8a..52baa9e 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdaze" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdaze.dll" allowwarnings="true">
-       <importlibrary definition="kbdaze.spec.def" />
+       <importlibrary definition="kbdaze.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdaze.c</file>
        <file>kbdaze.rc</file>
-       <file>kbdaze.spec</file>
 </module>
index 3011162..f97e344 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdazel" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdazel.dll" allowwarnings="true">
-       <importlibrary definition="kbdazel.spec.def" />
+       <importlibrary definition="kbdazel.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdazel.c</file>
        <file>kbdazel.rc</file>
-       <file>kbdazel.spec</file>
 </module>
index d17d60c..efca0ec 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true">
-       <importlibrary definition="kbdbe.spec.def" />
+       <importlibrary definition="kbdbe.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbe.c</file>
        <file>kbdbe.rc</file>
-       <file>kbdbe.spec</file>
 </module>
index 70aabd0..5a1c4cb 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbga" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true">
-       <importlibrary definition="kbdbga.spec.def" />
+       <importlibrary definition="kbdbga.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbga.c</file>
        <file>kbdbga.rc</file>
-       <file>kbdbga.spec</file>
 </module>
index 1bad671..c6ea382 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgm" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true">
-       <importlibrary definition="kbdbgm.spec.def" />
+       <importlibrary definition="kbdbgm.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbgm.c</file>
        <file>kbdbgm.rc</file>
-       <file>kbdbgm.spec</file>
 </module>
index 43d9114..e89c17c 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true">
-       <importlibrary definition="kbdbgt.spec.def" />
+       <importlibrary definition="kbdbgt.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbgt.c</file>
        <file>kbdbgt.rc</file>
-       <file>kbdbgt.spec</file>
 </module>
index 51303bb..a912d5a 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdblr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdblr.dll" allowwarnings="true">
-       <importlibrary definition="kbdblr.spec.def" />
+       <importlibrary definition="kbdblr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdblr.c</file>
        <file>kbdblr.rc</file>
-       <file>kbdblr.spec</file>
 </module>
index e0a2d6d..87a8230 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbr.dll" allowwarnings="true">
-       <importlibrary definition="kbdbr.spec.def" />
+       <importlibrary definition="kbdbr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbr.c</file>
        <file>kbdbr.rc</file>
-       <file>kbdbr.spec</file>
 </module>
index 81efd76..c92f791 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true">
-       <importlibrary definition="kbdbur.spec.def" />
+       <importlibrary definition="kbdbur.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbur.c</file>
        <file>kbdbur.rc</file>
-       <file>kbdbur.spec</file>
 </module>
index 9857e8f..0646e31 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcan" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcan.dll" allowwarnings="true">
-       <importlibrary definition="kbdcan.spec.def" />
+       <importlibrary definition="kbdcan.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdcan.c</file>
        <file>kbdcan.rc</file>
-       <file>kbdcan.spec</file>
 </module>
index f709a9e..5c15707 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcr.dll" allowwarnings="true">
-       <importlibrary definition="kbdcr.spec.def" />
+       <importlibrary definition="kbdcr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdcr.c</file>
        <file>kbdcr.rc</file>
-       <file>kbdcr.spec</file>
 </module>
index c9d22a6..378e7f5 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcz1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true">
-       <importlibrary definition="kbdcz1.spec.def" />
+       <importlibrary definition="kbdcz1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdcz1.c</file>
        <file>kbdcz1.rc</file>
-       <file>kbdcz1.spec</file>
 </module>
index b3582af..6e87af1 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdda" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true">
-       <importlibrary definition="kbdda.spec.def" />
+       <importlibrary definition="kbdda.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdda.c</file>
        <file>kbdda.rc</file>
-       <file>kbdda.spec</file>
 </module>
index 89a765c..5705ccc 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbddv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true">
-       <importlibrary definition="kbddv.spec.def" />
+       <importlibrary definition="kbddv.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbddv.c</file>
        <file>kbddv.rc</file>
-       <file>kbddv.spec</file>
 </module>
index 45cfdf8..9f760d1 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdes" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true">
-       <importlibrary definition="kbdes.spec.def" />
+       <importlibrary definition="kbdes.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdes.c</file>
        <file>kbdes.rc</file>
-       <file>kbdes.spec</file>
 </module>
index 39c3b19..ce719a5 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdest" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdest.dll" allowwarnings="true">
-       <importlibrary definition="kbdest.spec.def" />
+       <importlibrary definition="kbdest.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdest.c</file>
        <file>kbdest.rc</file>
-       <file>kbdest.spec</file>
 </module>
index 7d20ce4..1bf5206 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfc.dll" allowwarnings="true">
-       <importlibrary definition="kbdfc.spec.def" />
+       <importlibrary definition="kbdfc.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdfc.c</file>
        <file>kbdfc.rc</file>
-       <file>kbdfc.spec</file>
 </module>
index 8def349..847f5e7 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfi" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfi.dll" allowwarnings="true">
-       <importlibrary definition="kbdfi.spec.def" />
+       <importlibrary definition="kbdfi.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdfi.c</file>
        <file>kbdfi.rc</file>
-       <file>kbdfi.spec</file>
 </module>
index 3b92514..dd364bf 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true">
-       <importlibrary definition="kbdfr.spec.def" />
+       <importlibrary definition="kbdfr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdfr.c</file>
        <file>kbdfr.rc</file>
-       <file>kbdfr.spec</file>
 </module>
index cf930f8..dc0e32d 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgeo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgeo.dll" allowwarnings="true">
-       <importlibrary definition="kbdgeo.spec.def" />
+       <importlibrary definition="kbdgeo.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgeo.c</file>
        <file>kbdgeo.rc</file>
-       <file>kbdgeo.spec</file>
 </module>
index 5f282da..4ac2eab 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgerg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgerg.dll" allowwarnings="true">
-       <importlibrary definition="kbdgerg.spec.def" />
+       <importlibrary definition="kbdgerg.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgerg.c</file>
        <file>kbdgerg.rc</file>
-       <file>kbdgerg.spec</file>
 </module>
index 44403a4..724ae2f 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgneo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgneo.dll" allowwarnings="true">
-       <importlibrary definition="kbdgneo.spec.def" />
+       <importlibrary definition="kbdgneo.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgneo.c</file>
        <file>kbdgneo.rc</file>
-       <file>kbdgneo.spec</file>
 </module>
index d992f6e..99d0009 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true">
-       <importlibrary definition="kbdgr.spec.def" />
+       <importlibrary definition="kbdgr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgr.c</file>
        <file>kbdgr.rc</file>
-       <file>kbdgr.spec</file>
 </module>
index 5f22823..f3391e1 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgrist" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgrist.dll" allowwarnings="true">
-       <importlibrary definition="kbdgrist.spec.def" />
+       <importlibrary definition="kbdgrist.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgrist.c</file>
        <file>kbdgrist.rc</file>
-       <file>kbdgrist.spec</file>
 </module>
index 8dfa25c..6bcb456 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true">
-       <importlibrary definition="kbdhe.spec.def" />
+       <importlibrary definition="kbdhe.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdhe.c</file>
        <file>kbdhe.rc</file>
-       <file>kbdhe.spec</file>
 </module>
index f163665..a4c522b 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdheb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true">
-       <importlibrary definition="kbdheb.spec.def" />
+       <importlibrary definition="kbdheb.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdheb.c</file>
        <file>kbdheb.rc</file>
-       <file>kbdheb.spec</file>
 </module>
index 33d5a8a..037c29b 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhu" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhu.dll" allowwarnings="true">
-       <importlibrary definition="kbdhu.spec.def" />
+       <importlibrary definition="kbdhu.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdhu.c</file>
        <file>kbdhu.rc</file>
-       <file>kbdhu.spec</file>
 </module>
index ca14176..765fe54 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdic" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdic.dll" allowwarnings="true">
-       <importlibrary definition="kbdic.spec.def" />
+       <importlibrary definition="kbdic.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdic.c</file>
        <file>kbdic.rc</file>
-       <file>kbdic.spec</file>
 </module>
index eb093ce..62d0874 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinasa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinasa.dll" allowwarnings="true">
-       <importlibrary definition="kbdinasa.spec.def" />
+       <importlibrary definition="kbdinasa.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinasa.c</file>
        <file>kbdinasa.rc</file>
-       <file>kbdinasa.spec</file>
 </module>
index 418fbe7..3114edc 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinben" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinben.dll" allowwarnings="true">
-       <importlibrary definition="kbdinben.spec.def" />
+       <importlibrary definition="kbdinben.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinben.c</file>
        <file>kbdinben.rc</file>
-       <file>kbdinben.spec</file>
 </module>
index 67c41f3..a413b9f 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdindev" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdindev.dll" allowwarnings="true">
-       <importlibrary definition="kbdindev.spec.def" />
+       <importlibrary definition="kbdindev.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdindev.c</file>
        <file>kbdindev.rc</file>
-       <file>kbdindev.spec</file>
 </module>
index aca7a77..ceb9e68 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinguj" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinguj.dll" allowwarnings="true">
-       <importlibrary definition="kbdinguj.spec.def" />
+       <importlibrary definition="kbdinguj.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinguj.c</file>
        <file>kbdinguj.rc</file>
-       <file>kbdinguj.spec</file>
 </module>
index 4d4f50b..f18261a 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinmal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinmal.dll" allowwarnings="true">
-       <importlibrary definition="kbdinmal.spec.def" />
+       <importlibrary definition="kbdinmal.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinmal.c</file>
        <file>kbdinmal.rc</file>
-       <file>kbdinmal.spec</file>
 </module>
index 4d35719..98bf4f0 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdir" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdir.dll" allowwarnings="true">
-       <importlibrary definition="kbdir.spec.def" />
+       <importlibrary definition="kbdir.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdir.c</file>
        <file>kbdir.rc</file>
-       <file>kbdir.spec</file>
 </module>
index eeca818..eedfc12 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdit" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdit.dll" allowwarnings="true">
-       <importlibrary definition="kbdit.spec.def" />
+       <importlibrary definition="kbdit.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdit.c</file>
        <file>kbdit.rc</file>
-       <file>kbdit.spec</file>
 </module>
index 3453ab7..1ab11a9 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdja" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdja.dll" allowwarnings="true">
-       <importlibrary definition="kbdja.spec.def" />
+       <importlibrary definition="kbdja.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdja.c</file>
        <file>kbdja.rc</file>
-       <file>kbdja.spec</file>
 </module>
index 646a073..9e1754e 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdkaz" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdkaz.dll" allowwarnings="true">
-       <importlibrary definition="kbdkaz.spec.def" />
+       <importlibrary definition="kbdkaz.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdkaz.c</file>
        <file>kbdkaz.rc</file>
-       <file>kbdkaz.spec</file>
 </module>
index f6ad227..952be1f 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdko" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdko.dll" allowwarnings="true">
-       <importlibrary definition="kbdko.spec.def" />
+       <importlibrary definition="kbdko.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdko.c</file>
        <file>kbdko.rc</file>
-       <file>kbdko.spec</file>
 </module>
index f6eff54..80a223a 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdla" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdla.dll" allowwarnings="true">
-       <importlibrary definition="kbdla.spec.def" />
+       <importlibrary definition="kbdla.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdla.c</file>
        <file>kbdla.rc</file>
-       <file>kbdla.spec</file>
 </module>
index 682e2fc..7bf8578 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlt.dll" allowwarnings="true">
-       <importlibrary definition="kbdlt.spec.def" />
+       <importlibrary definition="kbdlt.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdlt.c</file>
        <file>kbdlt.rc</file>
-       <file>kbdlt.spec</file>
 </module>
index 9d099e8..779582a 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlv.dll" allowwarnings="true">
-       <importlibrary definition="kbdlv.spec.def" />
+       <importlibrary definition="kbdlv.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdlv.c</file>
        <file>kbdlv.rc</file>
-       <file>kbdlv.spec</file>
 </module>
index ed855b1..dde788d 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdmac" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdmac.dll" allowwarnings="true">
-       <importlibrary definition="kbdmac.spec.def" />
+       <importlibrary definition="kbdmac.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdmac.c</file>
        <file>kbdmac.rc</file>
-       <file>kbdmac.spec</file>
 </module>
index 926c5b0..448491c 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdne" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdne.dll" allowwarnings="true">
-       <importlibrary definition="kbdne.spec.def" />
+       <importlibrary definition="kbdne.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdne.c</file>
        <file>kbdne.rc</file>
-       <file>kbdne.spec</file>
 </module>
index 8c53f1a..65696b4 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdno" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true">
-       <importlibrary definition="kbdno.spec.def" />
+       <importlibrary definition="kbdno.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdno.c</file>
        <file>kbdno.rc</file>
-       <file>kbdno.spec</file>
 </module>
index c67bec1..a39be73 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true">
-       <importlibrary definition="kbdpl1.spec.def" />
+       <importlibrary definition="kbdpl1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdpl1.c</file>
        <file>kbdpl1.rc</file>
-       <file>kbdpl1.spec</file>
 </module>
index 2610aff..f5dc73a 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpo.dll" allowwarnings="true">
-       <importlibrary definition="kbdpo.spec.def" />
+       <importlibrary definition="kbdpo.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdpo.c</file>
        <file>kbdpo.rc</file>
-       <file>kbdpo.spec</file>
 </module>
index 15fee38..84f2718 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdro" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true">
-       <importlibrary definition="kbdro.spec.def" />
+       <importlibrary definition="kbdro.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdro.c</file>
        <file>kbdro.rc</file>
-       <file>kbdro.spec</file>
 </module>
index 7d84ce5..a446920 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true">
-       <importlibrary definition="kbdru.spec.def" />
+       <importlibrary definition="kbdru.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdru.c</file>
        <file>kbdru.rc</file>
-       <file>kbdru.spec</file>
 </module>
index 104e57b..fe413e1 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true">
-       <importlibrary definition="kbdru1.spec.def" />
+       <importlibrary definition="kbdru1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdru1.c</file>
        <file>kbdru1.rc</file>
-       <file>kbdru1.spec</file>
 </module>
index dfb5dca..0a883c3 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true">
-       <importlibrary definition="kbdsg.spec.def" />
+       <importlibrary definition="kbdsg.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsg.c</file>
        <file>kbdsg.rc</file>
-       <file>kbdsg.spec</file>
 </module>
index db09387..e2ee24e 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true">
-       <importlibrary definition="kbdsk.spec.def" />
+       <importlibrary definition="kbdsk.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsk.c</file>
        <file>kbdsk.rc</file>
-       <file>kbdsk.spec</file>
 </module>
index e639566..7f15ccd 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true">
-       <importlibrary definition="kbdsk1.spec.def" />
+       <importlibrary definition="kbdsk1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsk1.c</file>
        <file>kbdsk1.rc</file>
-       <file>kbdsk1.spec</file>
 </module>
index 70733e9..32cf47d 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true">
-       <importlibrary definition="kbdsw.spec.def" />
+       <importlibrary definition="kbdsw.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsw.c</file>
        <file>kbdsw.rc</file>
-       <file>kbdsw.spec</file>
 </module>
index b158a4b..ddffed3 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtat" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true">
-       <importlibrary definition="kbdtat.spec.def" />
+       <importlibrary definition="kbdtat.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdtat.c</file>
        <file>kbdtat.rc</file>
-       <file>kbdtat.spec</file>
 </module>
index 57dac75..2083fbf 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth0" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth0.dll" allowwarnings="true">
-       <importlibrary definition="kbdth0.spec.def" />
+       <importlibrary definition="kbdth0.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth0.c</file>
        <file>kbdth0.rc</file>
-       <file>kbdth0.spec</file>
 </module>
index 918ccae..ff027cf 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth1.dll" allowwarnings="true">
-       <importlibrary definition="kbdth1.spec.def" />
+       <importlibrary definition="kbdth1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth1.c</file>
        <file>kbdth1.rc</file>
-       <file>kbdth1.spec</file>
 </module>
index 23028cd..986a062 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true">
-       <importlibrary definition="kbdth2.spec.def" />
+       <importlibrary definition="kbdth2.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth2.c</file>
        <file>kbdth2.rc</file>
-       <file>kbdth2.spec</file>
 </module>
index 8d4599d..9cd3614 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth3.dll" allowwarnings="true">
-       <importlibrary definition="kbdth3.spec.def" />
+       <importlibrary definition="kbdth3.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth3.c</file>
        <file>kbdth3.rc</file>
-       <file>kbdth3.spec</file>
 </module>
index 5b0064c..ba720c1 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuf" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true">
-       <importlibrary definition="kbdtuf.spec.def" />
+       <importlibrary definition="kbdtuf.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdtuf.c</file>
        <file>kbdtuf.rc</file>
-       <file>kbdtuf.spec</file>
 </module>
index 1cc516f..501ef71 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuq" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true">
-       <importlibrary definition="kbdtuq.spec.def" />
+       <importlibrary definition="kbdtuq.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdtuq.c</file>
        <file>kbdtuq.rc</file>
-       <file>kbdtuq.spec</file>
 </module>
index 50cc9b8..a0eadb4 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true">
-       <importlibrary definition="kbduk.spec.def" />
+       <importlibrary definition="kbduk.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbduk.c</file>
        <file>kbduk.rc</file>
-       <file>kbduk.spec</file>
 </module>
index c38ab57..bc4e4a3 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true">
-       <importlibrary definition="kbdur.spec.def" />
+       <importlibrary definition="kbdur.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdur.c</file>
        <file>kbdur.rc</file>
-       <file>kbdur.spec</file>
 </module>
index 91c94bd..069e3ee 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdurs" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true">
-       <importlibrary definition="kbdurs.spec.def" />
+       <importlibrary definition="kbdurs.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdurs.c</file>
        <file>kbdurs.rc</file>
-       <file>kbdurs.spec</file>
 </module>
index 42c7ca0..adb0126 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdus" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true">
-       <importlibrary definition="kbdus.spec.def" />
+       <importlibrary definition="kbdus.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdus.c</file>
        <file>kbdus.rc</file>
-       <file>kbdus.spec</file>
 </module>
index c9dc1b9..b3b4514 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusa.dll" allowwarnings="true">
-       <importlibrary definition="kbdusa.spec.def" />
+       <importlibrary definition="kbdusa.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusa.c</file>
        <file>kbdusa.rc</file>
-       <file>kbdusa.spec</file>
 </module>
index 80de56d..a93f20d 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true">
-       <importlibrary definition="kbdusl.spec.def" />
+       <importlibrary definition="kbdusl.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusl.c</file>
        <file>kbdusl.rc</file>
-       <file>kbdusl.spec</file>
 </module>
index 3fa2412..68a0424 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true">
-       <importlibrary definition="kbdusr.spec.def" />
+       <importlibrary definition="kbdusr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusr.c</file>
        <file>kbdusr.rc</file>
-       <file>kbdusr.spec</file>
 </module>
index c2eb6e9..e6e5df6 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusx" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true">
-       <importlibrary definition="kbdusx.spec.def" />
+       <importlibrary definition="kbdusx.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusx.c</file>
        <file>kbdusx.rc</file>
-       <file>kbdusx.spec</file>
 </module>
index cf995a0..da804ac 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduzb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true">
-       <importlibrary definition="kbduzb.spec.def" />
+       <importlibrary definition="kbduzb.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbduzb.c</file>
        <file>kbduzb.rc</file>
-       <file>kbduzb.spec</file>
 </module>
index 472e3f9..b3b0771 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdvntc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true">
-       <importlibrary definition="kbdvntc.spec.def" />
+       <importlibrary definition="kbdvntc.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdvntc.c</file>
        <file>kbdvntc.rc</file>
-       <file>kbdvntc.spec</file>
 </module>
index bc81aa5..18eba58 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true">
-       <importlibrary definition="kbdycc.spec.def" />
+       <importlibrary definition="kbdycc.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdycc.c</file>
        <file>kbdycc.rc</file>
-       <file>kbdycc.spec</file>
 </module>
index 4da9d79..eff20bb 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true">
-       <importlibrary definition="kbdycl.spec.def" />
+       <importlibrary definition="kbdycl.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdycl.c</file>
        <file>kbdycl.rc</file>
-       <file>kbdycl.spec</file>
 </module>
index 7a3d3c2..30e5a44 100644 (file)
@@ -1,5 +1,5 @@
 <module name="deskadp" type="win32dll" baseaddress="${BASEADDRESS_DESKADP}" installbase="system32" installname="deskadp.dll" unicode="yes">
-       <importlibrary definition="deskadp.spec.def" />
+       <importlibrary definition="deskadp.spec" />
        <include base="deskadp">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
@@ -15,6 +15,5 @@
        <file>deskadp.c</file>
        <file>shxiface.c</file>
        <file>deskadp.rc</file>
-       <file>deskadp.spec</file>
        <pch>precomp.h</pch>
 </module>
index 443df55..63d237b 100644 (file)
@@ -1,5 +1,5 @@
 <module name="deskmon" type="win32dll" baseaddress="${BASEADDRESS_DESKMON}" installbase="system32" installname="deskmon.dll" unicode="yes">
-       <importlibrary definition="deskmon.spec.def" />
+       <importlibrary definition="deskmon.spec" />
        <include base="deskmon">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
index 7986fee..d27e1e4 100644 (file)
@@ -1,5 +1,5 @@
 <module name="fontext" type="win32dll" baseaddress="${BASEADDRESS_FONTEXT}" installbase="system32" installname="fontext.dll" unicode="yes">
-       <importlibrary definition="fontext.spec.def" />
+       <importlibrary definition="fontext.spec" />
        <include base="fontext">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
index cad5f42..047b0ac 100644 (file)
@@ -1,5 +1,5 @@
 <module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll" unicode="yes">
-       <importlibrary definition="acledit.spec.def" />
+       <importlibrary definition="acledit.spec" />
        <include base="acledit">.</include>
 
        <metadata description = "Access Control List Editor" />
index 5dd969b..ecbffd5 100644 (file)
@@ -1,5 +1,5 @@
 <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" unicode="yes">
-       <importlibrary definition="aclui.spec.def" />
+       <importlibrary definition="aclui.spec" />
        <include base="aclui">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
index de904cb..b0a4a12 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}" installbase="system32" installname="advpack.dll" allowwarnings="true">
-       <importlibrary definition="advpack.spec.def" />
+       <importlibrary definition="advpack.spec" />
        <include base="advpack">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index eed64ff..cdbfa23 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="atl.spec.def" />
+       <importlibrary definition="atl.spec" />
        <include base="atl">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 854672b..e5a053d 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="avifil32.spec.def" />
+       <importlibrary definition="avifil32.spec" />
        <include base="avifil32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 671f9cc..2c19c0d 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="browseui" type="win32dll" baseaddress="${BASEADDRESS_BROWSEUI}" installbase="system32" installname="browseui.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="browseui.spec.def" />
+       <importlibrary definition="browseui.spec" />
        <include base="browseui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="explorer_new">.</include>
index f8e369d..20a6ca8 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="cabinet.spec.def" />
+       <importlibrary definition="cabinet.spec" />
        <include base="cabinet">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index ace4c0c..065b1e1 100644 (file)
@@ -1,5 +1,5 @@
 <module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll" unicode="yes">
-       <importlibrary definition="cards.spec.def" />
+       <importlibrary definition="cards.spec" />
        <include base="cards">.</include>
 
        <!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
index 410acc5..1ea58a0 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="clusapi" type="win32dll" baseaddress="${BASEADDRESS_CLUSAPI}" installbase="system32" installname="clusapi.dll" allowwarnings="true">
-       <importlibrary definition="clusapi.spec.def" />
+       <importlibrary definition="clusapi.spec" />
        <include base="clusapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index d9c2fb7..551b99d 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="comcat.spec.def" />
+       <importlibrary definition="comcat.spec" />
        <include base="comcat">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 95259d9..b55934b 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllInstall" />
-       <importlibrary definition="comctl32.spec.def" />
+       <importlibrary definition="comctl32.spec" />
        <include base="comctl32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index bce7564..57e7c22 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true">
-       <importlibrary definition="comdlg32.spec.def" />
+       <importlibrary definition="comdlg32.spec" />
        <include base="comdlg32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 8d7403a..cd7ce26 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true">
-       <importlibrary definition="compstui.spec.def" />
+       <importlibrary definition="compstui.spec" />
        <include base="compstui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index e07e0f8..0ef5423 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="credui" type="win32dll" baseaddress="${BASEADDRESS_CREDUI}" installbase="system32" installname="credui.dll" allowwarnings="true">
-       <importlibrary definition="credui.spec.def" />
+       <importlibrary definition="credui.spec" />
        <include base="credui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 69026ee..f70d712 100644 (file)
@@ -1,5 +1,5 @@
 <module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll" allowwarnings="true">
-       <importlibrary definition="crypt32.spec.def" />
+       <importlibrary definition="crypt32.spec" />
        <include base="crypt32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index d8a3f47..23da95b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cryptdll" type="win32dll" baseaddress="${BASEADDRESS_CRYPTDLL}" installbase="system32" installname="cryptdll.dll" allowwarnings="true">
-       <importlibrary definition="cryptdll.spec.def" />
+       <importlibrary definition="cryptdll.spec" />
        <include base="cryptdll">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index d8a50dd..c263f11 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="cryptnet.spec.def" />
+       <importlibrary definition="cryptnet.spec" />
        <include base="cryptnet">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 63a6d1a..bab940f 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
        <!--autoregister infsection="OleControlDlls" type="DllRegisterServer" /-->
-       <importlibrary definition="cryptui.spec.def" />
+       <importlibrary definition="cryptui.spec" />
        <include base="cryptui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 236536a..ff2a5c2 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true">
-       <importlibrary definition="dbghelp.spec.def" />
+       <importlibrary definition="dbghelp.spec" />
        <include base="dbghelp">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 35367a6..9b03c62 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dciman32" type="win32dll" baseaddress="${BASEADDRESS_DCIMAN32}" installbase="system32" installname="dciman32.dll" allowwarnings="true">
-       <importlibrary definition="dciman32.spec.def" />
+       <importlibrary definition="dciman32.spec" />
        <include base="dciman32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 226979a..926ce28 100644 (file)
@@ -1,6 +1,6 @@
 <module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true" unicode="yes">
        <include base="devmgr">.</include>
-       <importlibrary definition="devmgr.spec.def" />
+       <importlibrary definition="devmgr.spec" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 6964d56..49fe658 100644 (file)
@@ -1,5 +1,5 @@
 <module name="dhcpcsvc" type="win32dll" baseaddress="${BASEADDRESS_DHCPCSVC}" installbase="system32" installname="dhcpcsvc.dll">
-       <importlibrary definition="dhcpcsvc.spec.def" />
+       <importlibrary definition="dhcpcsvc.spec" />
        <include base="dhcpcsvc">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT=0x0500" />
index 90cabde..0d3badf 100644 (file)
@@ -1,5 +1,5 @@
 <module name="fusion" type="win32dll" baseaddress="${BASEADDRESS_FUSION}" installbase="system32" installname="fusion.dll" allowwarnings="true">
-       <importlibrary definition="fusion.spec.def" />
+       <importlibrary definition="fusion.spec" />
        <include base="fusion">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index eb165bb..fe7281c 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true">
-       <importlibrary definition="gdiplus.spec.def" />
+       <importlibrary definition="gdiplus.spec" />
        <include base="gdiplus">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index d10a924..a576b6b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="getuname" type="win32dll" baseaddress="${BASEADDRESS_GETUNAME}" installbase="system32" installname="getuname.dll" unicode="yes">
-       <importlibrary definition="getuname.spec.def" />
+       <importlibrary definition="getuname.spec" />
        <include base="getuname">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="WINVER">0x600</define>
index 53bbdf2..6c7cfc8 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="hhctrl.ocx.spec.def" />
+       <importlibrary definition="hhctrl.ocx.spec" />
        <include base="hhctrl">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="ReactOS" root="intermediate">include/reactos</include>
index 531c3ff..b5b5eb8 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="hlink" type="win32dll" baseaddress="${BASEADDRESS_HLINK}" installbase="system32" installname="hlink.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="hlink.spec.def" />
+       <importlibrary definition="hlink.spec" />
        <include base="hlink">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 295a565..ce838e0 100644 (file)
@@ -1,5 +1,5 @@
 <module name="icmp" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_ICMP}" installbase="system32" installname="icmp.dll" allowwarnings="true">
-       <importlibrary definition="icmp.spec.def" />
+       <importlibrary definition="icmp.spec" />
        <include base="icmp">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_WINNT">0x501</define>
index c65b8f5..b03f5af 100644 (file)
@@ -1,5 +1,5 @@
 <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true">
-       <importlibrary definition="imagehlp.spec.def" />
+       <importlibrary definition="imagehlp.spec" />
        <include base="imagehlp">.</include>
        <define name="_WIN32_WINNT">0x600</define>
        <define name="WINVER">0x0600</define>
index 9025374..421b1a0 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll" allowwarnings="true">
-       <importlibrary definition="imm32.spec.def" />
+       <importlibrary definition="imm32.spec" />
        <include base="imm32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 428f45b..0bc13f6 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="inetcomm" type="win32dll" baseaddress="${BASEADDRESS_INETCOMM}" installbase="system32" installname="inetcomm.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="inetcomm.spec.def" />
+       <importlibrary definition="inetcomm.spec" />
        <include base="inetcomm">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index ad685b8..0f4fd6a 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true">
-       <importlibrary definition="inetmib1.spec.def" />
+       <importlibrary definition="inetmib1.spec" />
        <include base="inetmib1">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index b93ab59..5acca90 100644 (file)
@@ -1,5 +1,5 @@
 <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes">
-       <importlibrary definition="iphlpapi.spec.def" />
+       <importlibrary definition="iphlpapi.spec" />
        <include base="iphlpapi">include</include>
        <include base="ReactOS">include/reactos/wine</include>
        <library>wine</library>
index b930874..eca0c55 100644 (file)
@@ -1,7 +1,7 @@
 <group>
 <module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="jscript.spec.def" />
+       <importlibrary definition="jscript.spec" />
        <include base="jscript">.</include>
        <include base="jscript" root="intermediate">.</include>
        <include base="ReactOS">include/reactos/wine</include>
index eacdef6..41a294f 100644 (file)
@@ -1,5 +1,5 @@
 <module name="lpk" type="win32dll" baseaddress="${BASEADDRESS_LPK}" installbase="system32" installname="lpk.dll" unicode="yes">
-       <importlibrary definition="lpk.spec.def" />
+       <importlibrary definition="lpk.spec" />
        <include base="lpk">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="WINVER">0x0600</define>
index 4232395..f4fb312 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="lz32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true">
-       <importlibrary definition="lz32.spec.def" />
+       <importlibrary definition="lz32.spec" />
        <include base="lz32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index dc600d6..e24d115 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll" allowwarnings="true">
-       <importlibrary definition="mapi32.spec.def" />
+       <importlibrary definition="mapi32.spec" />
        <include base="mapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 46a20c9..cc08327 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="mlang" type="win32dll" baseaddress="${BASEADDRESS_MLANG}" installbase="system32" installname="mlang.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="mlang.spec.def" />
+       <importlibrary definition="mlang.spec" />
        <include base="mlang">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index f962719..4443071 100644 (file)
@@ -1,5 +1,5 @@
 <module name="mmdrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes">
-       <importlibrary definition="mmdrv.spec.def" />
+       <importlibrary definition="mmdrv.spec" />
        <include base="mmdrv">.</include>
        <define name="NDEBUG" />
        <library>ntdll</library>
index afa5a91..c316c0d 100644 (file)
@@ -1,5 +1,5 @@
 <module name="modemui" type="win32dll" baseaddress="${BASEADDRESS_MODEMUI}" installbase="system32" installname="modemui.dll" unicode="true">
-       <importlibrary definition="modemui.spec.def" />
+       <importlibrary definition="modemui.spec" />
        <include base="modemui">.</include>
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x0500</define>
index 8df5fd1..cc17d60 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
-       <importlibrary definition="mpr.spec.def" />
+       <importlibrary definition="mpr.spec" />
        <include base="mpr">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 542f8af..0044f10 100644 (file)
@@ -1,5 +1,5 @@
 <module name="mprapi" type="win32dll" baseaddress="${BASEADDRESS_MPRAPI}" installbase="system32" installname="mprapi.dll">
-       <importlibrary definition="mprapi.spec.def" />
+       <importlibrary definition="mprapi.spec" />
        <include base="mprapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 9d83ecf..337a99b 100644 (file)
@@ -1,5 +1,5 @@
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
-       <importlibrary definition="msacm32.spec.def" />
+       <importlibrary definition="msacm32.spec" />
        <include base="msacm32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
index 7c80527..76726a3 100644 (file)
@@ -1,5 +1,5 @@
 <module name="mscoree" type="win32dll" baseaddress="${BASEADDRESS_MSCOREE}" installbase="system32" installname="mscoree.dll">
-       <importlibrary definition="mscoree.spec.def" />
+       <importlibrary definition="mscoree.spec" />
        <include base="mscoree">.</include>
        <library>wine</library>
        <library>kernel32</library>
index d000673..951dc1c 100644 (file)
@@ -1,5 +1,5 @@
 <module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}" installbase="system32" installname="msgina.dll">
-       <importlibrary definition="msgina.spec.def" />
+       <importlibrary definition="msgina.spec" />
        <include base="msgina">.</include>
        <include base="msgina">include</include>
        <library>ntdll</library>
index 2f47662..a4ff711 100644 (file)
@@ -4,7 +4,7 @@
        <file>mshtml_tlb.idl</file>
 </module>
 <module name="mshtml.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="mshtml.tlb" entrypoint="0">
-       <importlibrary definition="mshtml.tlb.spec.def" />
+       <importlibrary definition="mshtml.tlb.spec" />
        <include base="mshtml.tlb" root="intermediate">.</include>
        <dependency>mshtml_tlb</dependency>
        <define name="__WINESRC__" />
index 5db3ddd..5bff1fc 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="Both" />
-       <importlibrary definition="mshtml.spec.def" />
+       <importlibrary definition="mshtml.spec" />
        <include base="mshtml">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index c2c37e7..99d5573 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="msi.spec.def" />
+       <importlibrary definition="msi.spec" />
        <include base="msi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 117fccb..c8f9a09 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true">
-       <importlibrary definition="msimg32.spec.def" />
+       <importlibrary definition="msimg32.spec" />
        <include base="msimg32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index ea4d1f6..0284375 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="mstask" type="win32dll" baseaddress="${BASEADDRESS_MSTASK}" installbase="system32" installname="mstask.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="mstask.spec.def" />
+       <importlibrary definition="mstask.spec" />
        <include base="mstask">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index dbe765c..8c5f224 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" installbase="system32" installname="msvcrt20.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="msvcrt20.spec.def" />
+       <importlibrary definition="msvcrt20.spec" />
        <include base="msvcrt20">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index b02916a..200942a 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt40" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT40}" installbase="system32" installname="msvcrt40.dll">
-       <importlibrary definition="msvcrt40.spec.def" />
+       <importlibrary definition="msvcrt40.spec" />
        <include base="msvcrt40">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index d1e3f50..5cf4f89 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll" allowwarnings="true">
-       <importlibrary definition="msvfw32.spec.def" />
+       <importlibrary definition="msvfw32.spec" />
        <include base="msvfw32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index ce4fd47..e61d94b 100644 (file)
@@ -1,7 +1,7 @@
 <group>
 <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="msxml3.spec.def" />
+       <importlibrary definition="msxml3.spec" />
        <include base="msxml3">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="msxml3" root="intermediate">.</include>
index 8700ed6..80aacc2 100644 (file)
@@ -1,5 +1,5 @@
 <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="nddeapi.spec.def" />
+        <importlibrary definition="nddeapi.spec" />
         <include base="nddeapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
index 9c2ef41..dd6e1f8 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true">
-       <importlibrary definition="netapi32.spec.def" />
+       <importlibrary definition="netapi32.spec" />
        <include base="netapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 8c6e0e3..c6d7998 100644 (file)
@@ -1,5 +1,5 @@
 <module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" installbase="system32" installname="netcfgx.dll">
-       <importlibrary definition="netcfgx.spec.def" />
+       <importlibrary definition="netcfgx.spec" />
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
        <library>ntdll</library>
        <library>rpcrt4</library>
index 0bab404..021663c 100644 (file)
@@ -1,5 +1,5 @@
 <module name="netid" type="win32dll" baseaddress="${BASEADDRESS_NETID}" installbase="system32" installname="netid.dll" unicode="true">
-       <importlibrary definition="netid.spec.def" />
+       <importlibrary definition="netid.spec" />
        <include base="netid">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
index 474472e..23440f8 100644 (file)
@@ -1,6 +1,6 @@
 <module name="netshell" type="win32dll" baseaddress="${BASEADDRESS_NETSHELL}" installbase="system32" installname="netshell.dll">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="netshell.spec.def" />
+       <importlibrary definition="netshell.spec" />
        <include base="netshell">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
index 910f542..d080d20 100644 (file)
@@ -1,6 +1,6 @@
 <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll" unicode="true">
        <include base="newdev">.</include>
-       <importlibrary definition="newdev.spec.def" />
+       <importlibrary definition="newdev.spec" />
        <define name="_WIN32_IE">0x0600</define>
        <define name="_WIN32_WINNT">0x0501</define>
        <file>newdev.c</file>
index ea1a3ac..5b92287 100644 (file)
@@ -1,5 +1,5 @@
 <module name="ntdsapi" type="win32dll" baseaddress="${BASEADDRESS_NTDSAPI}" installbase="system32" installname="ntdsapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="ntdsapi.spec.def" />
+        <importlibrary definition="ntdsapi.spec" />
         <include base="ntdsapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
index bbe1ac3..3f3b2e8 100644 (file)
@@ -1,5 +1,5 @@
 <module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll" unicode="yes">
-       <importlibrary definition="ntmarta.spec.def" />
+       <importlibrary definition="ntmarta.spec" />
        <include base="ntmarta">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x600</define>
index 18c6dbf..e5e0b17 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="objsel.spec.def" />
+       <importlibrary definition="objsel.spec" />
        <include base="objsel">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 4a96891..cddd6fa 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="odbc32" type="win32dll" baseaddress="${BASEADDRESS_ODBC32}" installbase="system32" installname="odbc32.dll" allowwarnings="true" >
-       <importlibrary definition="odbc32.spec.def" />
+       <importlibrary definition="odbc32.spec" />
        <include base="odbc32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index f8d461c..2e11268 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="odbccp32.spec.def" />
+       <importlibrary definition="odbccp32.spec" />
        <include base="odbccp32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 47082ef..37fa9b7 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="ole32.spec.def" />
+       <importlibrary definition="ole32.spec" />
        <include base="ole32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 46b65e2..6fc3183 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true" entrypoint="0">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="oleacc.spec.def" />
+       <importlibrary definition="oleacc.spec" />
        <include base="oleacc">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 83a0e2d..4e37d00 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="oleaut32.spec.def" />
+       <importlibrary definition="oleaut32.spec" />
        <include base="oleaut32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 53fd251..ca98792 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true">
-       <importlibrary definition="oledlg.spec.def" />
+       <importlibrary definition="oledlg.spec" />
        <include base="oledlg">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 1924854..f14d281 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="olepro32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="olepro32.spec.def" />
+       <importlibrary definition="olepro32.spec" />
        <include base="olepro32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 1a3e081..c1b3062 100644 (file)
@@ -1,5 +1,5 @@
 <module name="pdh" type="win32dll" baseaddress="${BASEADDRESS_PDH}" installbase="system32" installname="pdh.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="pdh.spec.def" />
+        <importlibrary definition="pdh.spec" />
         <include base="pdh">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
index 1cea520..8425b68 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" unicode="yes">
-       <importlibrary definition="powrprof.spec.def" />
+       <importlibrary definition="powrprof.spec" />
        <include base="powrprof">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
index de3560d..216ec66 100644 (file)
@@ -1,5 +1,5 @@
 <module name="printui" type="win32dll" baseaddress="${BASEADDRESS_PRINTUI}" installbase="system32" installname="printui.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="printui.spec.def" />
+        <importlibrary definition="printui.spec" />
         <include base="printui">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
index ea4383d..493a30f 100644 (file)
@@ -1,5 +1,5 @@
 <module name="pstorec" type="win32dll" baseaddress="${BASEADDRESS_PSTOREC}" installbase="system32" installname="pstorec.dll">
-       <importlibrary definition="pstorec.spec.def" />
+       <importlibrary definition="pstorec.spec" />
        <include base="pstorec">.</include>
        <library>wine</library>
        <library>kernel32</library>
index 67451d5..d78b7e1 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rasapi32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_RASAPI32}" installbase="system32" installname="rasapi32.dll" allowwarnings="true">
-       <importlibrary definition="rasapi32.spec.def" />
+       <importlibrary definition="rasapi32.spec" />
        <include base="rasapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 22759f6..6f31a16 100644 (file)
@@ -1,5 +1,5 @@
 <module name="rasdlg" type="win32dll" baseaddress="${BASEADDRESS_RASDLG}" installbase="system32" installname="rasdlg.dll">
-       <importlibrary definition="rasdlg.spec.def" />
+       <importlibrary definition="rasdlg.spec" />
        <include base="rasdlg">.</include>
        <define name="_DISABLE_TIDENTS" />
        <library>wine</library>
index 5f72da0..5df7820 100644 (file)
@@ -1,5 +1,5 @@
 <module name="rasman" type="win32dll" baseaddress="${BASEADDRESS_RASMAN}" installbase="system32" installname="rasman.dll">
-       <importlibrary definition="rasman.spec.def" />
+       <importlibrary definition="rasman.spec" />
        <include base="rasman">.</include>
        <define name="_DISABLE_TIDENTS" />
        <library>wine</library>
index 49bcba6..95c5484 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true">
-       <importlibrary definition="riched20.spec.def" />
+       <importlibrary definition="riched20.spec" />
        <include base="riched20">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 0b370e2..948f6ea 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll" allowwarnings="true">
-       <importlibrary definition="riched32.spec.def" />
+       <importlibrary definition="riched32.spec" />
        <include base="riched32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 132ed21..455dd4b 100644 (file)
@@ -1,6 +1,6 @@
 <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="rpcrt4.spec.def" />
+       <importlibrary definition="rpcrt4.spec" />
        <include base="rpcrt4">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__USE_W32API" />
index 50d0c58..a57bdcc 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="rsabase" type="win32dll" baseaddress="${BASEADDRESS_RSABASE}" installbase="system32" installname="rsabase.dll" allowwarnings="true" entrypoint="0">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="rsabase.spec.def" />
+       <importlibrary definition="rsabase.spec" />
        <include base="rsabase">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index e9805c0..6b0446a 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="rsaenh" type="win32dll" baseaddress="${BASEADDRESS_RSAENH}" installbase="system32" installname="rsaenh.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="rsaenh.spec.def" />
+       <importlibrary definition="rsaenh.spec" />
        <include base="rsaenh">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 44f8c06..fb0e462 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes">
-       <importlibrary definition="samsrv.spec.def" />
+       <importlibrary definition="samsrv.spec" />
        <include base="samsrv">.</include>
        <library>ntdll</library>
        <library>kernel32</library>
index 3a08581..52251fe 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" allowwarnings="true">
-       <importlibrary definition="schannel.spec.def" />
+       <importlibrary definition="schannel.spec" />
        <include base="schannel">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 0fd2ccb..e4cc704 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sensapi" type="win32dll" baseaddress="${BASEADDRESS_SENSAPI}" installbase="system32" installname="sensapi.dll" allowwarnings="true">
-       <importlibrary definition="sensapi.spec.def" />
+       <importlibrary definition="sensapi.spec" />
        <include base="sensapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 5d09b18..eb43bd5 100644 (file)
@@ -1,5 +1,5 @@
 <module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll" unicode="yes">
-       <importlibrary definition="serialui.spec.def" />
+       <importlibrary definition="serialui.spec" />
        <include base="serialui">.</include>
        <library>kernel32</library>
        <library>user32</library>
index 0a0301a..9f5a3ba 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes">
-       <importlibrary definition="setupapi.spec.def" />
+       <importlibrary definition="setupapi.spec" />
        <include base="setupapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="pnp_client">.</include>
index d3ad656..263c55c 100644 (file)
@@ -1,5 +1,5 @@
 <module name="sfc" type="win32dll" baseaddress="${BASEADDRESS_SFC}" installbase="system32" installname="sfc.dll" allowwarnings="yes">
-       <importlibrary definition="sfc.spec.def" />
+       <importlibrary definition="sfc.spec" />
        <include base="sfc">.</include>
        <library>kernel32</library>
        <file>sfc.c</file>
index 2e02263..6cc89c8 100644 (file)
@@ -1,5 +1,5 @@
 <module name="sfc_os" type="win32dll" baseaddress="${BASEADDRESS_SFC_OS}" installbase="system32" installname="sfc_os.dll" allowwarnings="yes">
-       <importlibrary definition="sfc_os.spec.def" />
+       <importlibrary definition="sfc_os.spec" />
        <include base="sfc_os">.</include>
        <library>kernel32</library>
        <file>sfc_os.c</file>
index 0e8a337..5678ab4 100644 (file)
@@ -1,6 +1,6 @@
 <module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="Both" />
-       <importlibrary definition="shdocvw.spec.def" />
+       <importlibrary definition="shdocvw.spec" />
        <include base="shdocvw">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
index d3eeeef..7bc769c 100644 (file)
@@ -1,6 +1,6 @@
 <module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll">
        <autoregister infsection="OleControlDlls" type="Both" />
-       <importlibrary definition="shell32.spec.def" />
+       <importlibrary definition="shell32.spec" />
        <include base="shell32">.</include>
        <include base="recyclebin">.</include>
        <include base="ReactOS">include/reactos/wine</include>
index 1d3aa77..2b08ca4 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="shfolder.spec.def" />
+       <importlibrary definition="shfolder.spec" />
        <include base="shfolder">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 99e1d13..07ff24d 100644 (file)
@@ -1,5 +1,5 @@
 <module name="shimgvw" type="win32dll" baseaddress="${BASEADDRESS_SHIMGVW}" installbase="system32" installname="shimgvw.dll">
-       <importlibrary definition="shimgvw.spec.def" />
+       <importlibrary definition="shimgvw.spec" />
        <include base="shimgvw">.</include>
        <define name="_DISABLE_TIDENTS" />
        <library>kernel32</library>
index cd9a166..2fda4a4 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true">
-       <importlibrary definition="shlwapi.spec.def" />
+       <importlibrary definition="shlwapi.spec" />
        <include base="shlwapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index e6ee0f8..ad9960e 100644 (file)
@@ -1,5 +1,5 @@
 <module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll" unicode="yes">
-       <importlibrary definition="snmpapi.spec.def" />
+       <importlibrary definition="snmpapi.spec" />
        <include base="snmpapi">.</include>
        <define name="_DISABLE_TIDENTS" />
        <library>ntdll</library>
index 4d9fd38..8d346b7 100644 (file)
@@ -9,7 +9,7 @@
        <file>std_ole_v2.idl</file>
 </module>
 <module name="stdole2.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb" entrypoint="0">
-       <importlibrary definition="stdole2.tlb.spec.def" />
+       <importlibrary definition="stdole2.tlb.spec" />
        <include base="stdole2.tlb">.</include>
        <include base="stdole2.tlb" root="intermediate">.</include>
        <include base="ReactOS">include/reactos/wine</include>
index 137073c..fe37991 100644 (file)
@@ -9,7 +9,7 @@
        <file>std_ole_v1.idl</file>
 </module>
 <module name="stdole32.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole32.tlb" entrypoint="0">
-       <importlibrary definition="stdole32.tlb.spec.def" />
+       <importlibrary definition="stdole32.tlb.spec" />
        <include base="stdole32.tlb">.</include>
        <include base="stdole32.tlb" root="intermediate">.</include>
        <include base="ReactOS">include/reactos/wine</include>
index 7559626..e9d8e47 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="sxs" type="win32dll" baseaddress="${BASEADDRESS_SXS}" installbase="system32" installname="sxs.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="sxs.spec.def" />
+        <importlibrary definition="sxs.spec" />
         <include base="sxs">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
index f156485..c4547d6 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="tapi32" type="win32dll" baseaddress="${BASEADDRESS_TAPI32}" installbase="system32" installname="tapi32.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="tapi32.spec.def" />
+       <importlibrary definition="tapi32.spec" />
        <include base="tapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 9493c10..710fb19 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="Both" />
-       <importlibrary definition="urlmon.spec.def" />
+       <importlibrary definition="urlmon.spec" />
        <include base="urlmon">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index cb7b18c..6f2af46 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="usp10" type="win32dll" baseaddress="${BASEADDRESS_USP10}" installbase="system32" installname="usp10.dll" allowwarnings="true">
-       <importlibrary definition="usp10.spec.def" />
+       <importlibrary definition="usp10.spec" />
        <include base="usp10">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 38b1f7b..a67bdaf 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="uxtheme" type="win32dll" baseaddress="${BASEADDRESS_UXTHEME}" installbase="system32" installname="uxtheme.dll" allowwarnings="true">
-       <importlibrary definition="uxtheme.spec.def" />
+       <importlibrary definition="uxtheme.spec" />
        <include base="uxtheme">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 80e2434..8ccedce 100644 (file)
@@ -1,5 +1,5 @@
 <module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll" unicode="yes">
-       <importlibrary definition="vdmdbg.spec.def" />
+       <importlibrary definition="vdmdbg.spec" />
        <include base="vdmdbg">.</include>
        <library>ntdll</library>
        <library>kernel32</library>
index 5ed4628..11a760f 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="version.spec.def" />
+       <importlibrary definition="version.spec" />
        <include base="version">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index c9db2a8..dd285bf 100644 (file)
@@ -1,5 +1,5 @@
 <module name="wdmaud.drv" type="win32dll" baseaddress="${BASEADDRESS_WDMAUD}" installbase="system32" installname="wdmaud.drv">
-       <importlibrary definition="wdmaud.spec.def" />
+       <importlibrary definition="wdmaud.spec" />
        <include base="wdmaud.drv">.</include>
        <define name="_DISABLE_TIDENTS" />
        <library>advapi32</library>
index 5841090..923e4bd 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="winhttp.spec.def" />
+       <importlibrary definition="winhttp.spec" />
        <include base="winhttp">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 29700ba..454c96e 100644 (file)
@@ -3,7 +3,7 @@
 <group>
 <module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllInstall" />
-       <importlibrary definition="wininet.spec.def" />
+       <importlibrary definition="wininet.spec" />
        <include base="wininet">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 9014796..1369968 100644 (file)
@@ -1,5 +1,5 @@
 <module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes">
-       <importlibrary definition="midimap.spec.def" />
+       <importlibrary definition="midimap.spec" />
        <include base="midimap">.</include>
        <include base="ReactOS">include/wine</include>
        <define name="_WIN32_IE">0x600</define>
index c493f03..16c62d4 100644 (file)
@@ -1,5 +1,5 @@
 <module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes">
-       <importlibrary definition="msacm.spec.def" />
+       <importlibrary definition="msacm.spec" />
        <include base="wavemap">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
index 5920588..799805f 100644 (file)
@@ -8,7 +8,7 @@
        <xi:include href="wavemap/wavemap.rbuild" />
 </directory>
 <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true">
-       <importlibrary definition="winmm.spec.def" />
+       <importlibrary definition="winmm.spec" />
        <include base="winmm">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
index baa9b29..0cc4f79 100644 (file)
@@ -1,6 +1,6 @@
 <module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="wintrust.spec.def" />
+       <importlibrary definition="wintrust.spec" />
        <include base="wintrust">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 2829f91..ca149a8 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wldap32" type="win32dll" baseaddress="${BASEADDRESS_WLDAP32}" installbase="system32" installname="wldap32.dll" allowwarnings="true">
-       <importlibrary definition="wldap32.spec.def" />
+       <importlibrary definition="wldap32.spec" />
        <include base="wldap32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index 6bf2724..dd64752 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes">
-       <importlibrary definition="wshtcpip.spec.def" />
+       <importlibrary definition="wshtcpip.spec" />
        <include base="wshtcpip">.</include>
        <library>ntdll</library>
        <library>kernel32</library>
index 89b77a1..c0bb012 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true">
-       <importlibrary definition="wtsapi32.spec.def" />
+       <importlibrary definition="wtsapi32.spec" />
        <include base="wtsapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
index a083300..895ab0b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll">
-       <importlibrary definition="bootvid.spec.def"></importlibrary>
+       <importlibrary definition="bootvid.spec"></importlibrary>
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
        <include base="bootvid">.</include>
        <library>ntoskrnl</library>
index 5c28035..e1f6ade 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32" installname="kdcom.dll">
-       <importlibrary definition="kdcom.spec.def"></importlibrary>
+       <importlibrary definition="kdcom.spec"></importlibrary>
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
        <include base="kdcom">.</include>
        <library>ntoskrnl</library>
index 55dbdf2..8d6d446 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dxapi" type="kernelmodedriver" 
 installbase="system32/drivers" installname="dxapi.sys">
-       <importlibrary definition="dxapi.spec.def" />
+       <importlibrary definition="dxapi.spec" />
        <include base="dxapi">.</include>
        <define name="__USE_W32API" />
        <define name="_DXAPI_" />
index 920183f..5747373 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys">
-       <importlibrary definition="dxg.spec.def" />
+       <importlibrary definition="dxg.spec" />
        <include base="dxg">.</include>
        <include base="dxg">include</include>
        <include base="ReactOS">subsystems/win32/win32k/include</include>
index c69bce2..a7de8b7 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dxgthk" type="kernelmodedriver" 
 installbase="system32/drivers" installname="dxgthk.sys">
-       <importlibrary definition="dxgthk.spec.def" />
+       <importlibrary definition="dxgthk.spec" />
        <include base="dxgthk">.</include>
        <define name="__USE_W32API" />
        <library>win32k</library>
index 4e93010..e89c090 100644 (file)
@@ -4,7 +4,7 @@
        <include base="ks">.</include>
        <include base="ks">..</include>
        <include base="ks">../include</include>
-       <importlibrary definition="ks.spec.def" />
+       <importlibrary definition="ks.spec" />
        <library>ntoskrnl</library>
        <define name="BUILDING_KS" />
        <define name="_NTDDK_" />
index 273f679..3919ba7 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys">
-       <importlibrary definition="tcpip.spec.def" />
+       <importlibrary definition="tcpip.spec" />
        <include base="tcpip">include</include>
        <include base="oskittcp">include</include>
        <define name="NDIS40" />
index 769ef89..48ea7b5 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys">
        <bootstrap installbase="$(CDOUTPUT)" />
-       <importlibrary definition="class2.spec.def" />
+       <importlibrary definition="class2.spec" />
        <library>ntoskrnl</library>
        <library>hal</library>
        <library>scsiport</library>
index 0691c33..2941d0f 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys">
-       <importlibrary definition="pciidex.spec.def" />
+       <importlibrary definition="pciidex.spec" />
        <library>ntoskrnl</library>
        <file>fdo.c</file>
        <file>miniport.c</file>
index 35ff835..df39c16 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
        <bootstrap installbase="$(CDOUTPUT)" />
-       <importlibrary definition="diskdump.spec.def" />
+       <importlibrary definition="diskdump.spec" />
        <include base="ReactOS">include/reactos/drivers</include>
        <library>ntoskrnl</library>
        <library>hal</library>
index 98e4707..81a6763 100644 (file)
@@ -3,7 +3,7 @@
 <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
        <bootstrap installbase="$(CDOUTPUT)" />
        <define name="_SCSIPORT_" />
-       <importlibrary definition="scsiport.spec.def" />
+       <importlibrary definition="scsiport.spec" />
        <include base="scsiport">.</include>
        <library>ntoskrnl</library>
        <library>hal</library>
index 5a9f436..1759f89 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys">
-       <importlibrary definition="usbd.spec.def" />
+       <importlibrary definition="usbd.spec" />
        <library>ntoskrnl</library>
        <library>hal</library>
        <file>usbd.c</file>
index cdadcab..8426b16 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="framebuf" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll">
-       <importlibrary definition="framebuf.spec.def" />
+       <importlibrary definition="framebuf.spec" />
        <include base="framebuf">.</include>
        <library>win32k</library>
        <library>libcntpr</library>
index 47c32ec..bfc08f0 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="framebufacc" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll">
-       <importlibrary definition="framebufacc.spec.def" />
+       <importlibrary definition="framebufacc.spec" />
        <include base="framebufacc">.</include>
        <library>win32k</library>
        <library>libcntpr</library>
index ca0d329..4166883 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="vgaddi" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll">
-       <importlibrary definition="vgaddi.spec.def" />
+       <importlibrary definition="vgaddi.spec" />
        <include base="vgaddi">.</include>
        <library>libcntpr</library>
        <library>win32k</library>
index 4555223..a2e1304 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys">
-       <importlibrary definition="videoprt.spec.def" />
+       <importlibrary definition="videoprt.spec" />
        <include base="videoprt">.</include>
        <include base="ntoskrnl">include</include>
        <define name="_VIDEOPORT_" />
index 6f2fc9c..fb4d99c 100644 (file)
@@ -8,7 +8,7 @@
        <linkerflag>-fno-rtti</linkerflag>
        -->
        <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
-       <importlibrary definition="portcls.spec.def" />
+       <importlibrary definition="portcls.spec" />
 
        <define name="_NTDDK_" />
        <define name="PC_NO_IMPORTS" />
index beef05a..ec0bf22 100644 (file)
@@ -4,7 +4,7 @@
        <include base="drmk">.</include>
        <include base="drmk">..</include>
        <include base="drmk">../include</include>
-       <importlibrary definition="drmk.spec.def" />
+       <importlibrary definition="drmk.spec" />
        <library>ntoskrnl</library>
        <define name="BUILDING_DRMK" />
        <file>stubs.cpp</file>
index 27501ff..edfaa72 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys">
-       <importlibrary definition="wmilib.spec.def" />
+       <importlibrary definition="wmilib.spec" />
        <include base="wmilib">.</include>
        <library>ntoskrnl</library>
        <file>wmilib.c</file>
index 83daee1..564920b 100644 (file)
@@ -14,7 +14,7 @@
     </if>
     <if property="ARCH" value="i386">
        <module name="hal" type="kernelmodedll">
-               <importlibrary definition="hal.spec.def" />
+               <importlibrary definition="hal.spec" />
                <include base="ntoskrnl">include</include>
                <library>ntoskrnl</library>
                <define name="_NTHAL_" />
index 1d13227..c295073 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll">
-       <importlibrary base="hal" definition="hal.spec.def" />
+       <importlibrary base="hal" definition="hal.spec" />
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
        <include base="halarm_generic">../include</include>
        <include base="ntoskrnl">include</include>
index 5595453..724e789 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <module name="halmp" type="kernelmodedll" entrypoint="0">
-               <importlibrary base="hal" definition="hal.spec.def" />
+               <importlibrary base="hal" definition="hal.spec" />
                <bootstrap installbase="$(CDOUTPUT)" />
                <include>include</include>
                <include base="ntoskrnl">include</include>
index c588db5..c206b7e 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll">
-               <importlibrary base="hal" definition="hal.spec.def" />
+               <importlibrary base="hal" definition="hal.spec" />
                <bootstrap installbase="$(CDOUTPUT)" />
                <include>include</include>
                <include base="ntoskrnl">include</include>
index 6dff278..923583a 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true">
-               <importlibrary base="hal" definition="hal.spec.def" />
+               <importlibrary base="hal" definition="hal.spec" />
                <include>include</include>
                <include base="ntoskrnl">include</include>
                <define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/debugsup/debugsup-ntos.def b/reactos/lib/debugsup/debugsup-ntos.def
deleted file mode 100644 (file)
index 6c6164c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-EXPORTS\r
-DbgBreakPoint@0\r
-DbgBreakPointWithStatus@4\r
-DbgPrint\r
-DbgPrompt@12\r
-DbgPrintEx\r
-vDbgPrintExWithPrefix@20\r
-RtlAssert@16\r
-RtlUnwind@16\r
-\r
-;EOF\r
diff --git a/reactos/lib/debugsup/debugsup-ntos.spec b/reactos/lib/debugsup/debugsup-ntos.spec
new file mode 100644 (file)
index 0000000..f7ec548
--- /dev/null
@@ -0,0 +1,8 @@
+@ stdcall DbgBreakPoint()
+@ stdcall DbgBreakPointWithStatus(long)
+@ varargs DbgPrint()
+@ varargs DbgPrintEx()
+@ stdcall DbgPrompt(ptr ptr long)
+@ stdcall RtlAssert(ptr ptr long ptr)
+@ stdcall RtlUnwind(ptr ptr ptr ptr)
+@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)
index 726633a..3e833c9 100644 (file)
@@ -2,9 +2,9 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">\r
 <group>\r
        <module name="debugsup_ntoskrnl" type="staticlibrary">\r
-               <importlibrary definition="debugsup-ntos.def" dllname="ntoskrnl.exe" />\r
+               <importlibrary definition="debugsup-ntos.spec" dllname="ntoskrnl.exe" />\r
        </module>\r
        <module name="debugsup_ntdll" type="staticlibrary">\r
-               <importlibrary definition="debugsup-ntos.def" dllname="ntdll.dll" />\r
+               <importlibrary definition="debugsup-ntos.spec" dllname="ntdll.dll" />\r
        </module>\r
 </group>\r
index a015aff..c72712d 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <bootstrap installbase="$(CDOUTPUT)" />
-       <importlibrary definition="ntoskrnl.spec.def" />
+       <importlibrary definition="ntoskrnl.spec" />
        <define name="_DISABLE_TIDENTS" />
        <define name="__NTOSKRNL__" />
        <define name="_NTOSKRNL_" />
index 531c008..0f98bf0 100644 (file)
@@ -310,6 +310,7 @@ void
 MingwModuleHandler::OutputCopyCommand ( const FileLocation& source,
                                         const FileLocation& destination )
 {
+       fprintf ( fMakefile, "# OUTPUT COPY COMMAND\n" );
        fprintf ( fMakefile,
                  "\t$(ECHO_CP)\n" );
        fprintf ( fMakefile,
@@ -408,7 +409,7 @@ MingwModuleHandler::GetObjectFilename (
        else if ( extension == ".mc" || extension == ".MC" )
                newExtension = ".rc";
        else if ( extension == ".spec" || extension == ".SPEC" )
-               newExtension = ".stubs.o";
+               newExtension = "_" + module.name + ".stubs.o";
        else if ( extension == ".idl" || extension == ".IDL" )
        {
                if ( module.type == RpcServer )
@@ -460,6 +461,7 @@ MingwModuleHandler::GenerateCleanTarget () const
        if ( module.type == Alias )
                return;
 
+       fprintf ( fMakefile, "# CLEAN TARGET\n" );
        fprintf ( fMakefile,
                  ".PHONY: %s_clean\n",
                  module.name.c_str() );
@@ -501,6 +503,7 @@ MingwModuleHandler::GenerateInstallTarget () const
 {
        if ( !module.install )
                return;
+       fprintf ( fMakefile, "# INSTALL TARGET\n" );
        fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() );
        fprintf ( fMakefile,
                  "%s_install: %s\n",
@@ -511,6 +514,7 @@ MingwModuleHandler::GenerateInstallTarget () const
 void
 MingwModuleHandler::GenerateDependsTarget () const
 {
+       fprintf ( fMakefile, "# DEPENDS TARGET\n" );
        fprintf ( fMakefile,
                  ".PHONY: %s_depends\n",
                  module.name.c_str() );
@@ -783,6 +787,7 @@ MingwModuleHandler::GenerateMacros (
        const vector<LinkerFlag*>* linkerFlags,
        set<const Define *>& used_defs )
 {
+       fprintf ( fMakefile, "# MACROS\n" );
        GenerateMacro ( assignmentOperation,
                        cflagsMacro,
                        data,
@@ -841,6 +846,7 @@ MingwModuleHandler::GenerateSourceMacros (
 {
        size_t i;
 
+       fprintf ( fMakefile, "# SOURCE MACROS\n" );
        const vector<CompilationUnit*>& compilationUnits = data.compilationUnits;
        vector<const FileLocation *> headers;
        if ( compilationUnits.size () > 0 )
@@ -887,6 +893,7 @@ MingwModuleHandler::GenerateObjectMacros (
        vector<const FileLocation *> headers;
        vector<const FileLocation *> mcheaders;
        vector<const FileLocation *> mcresources;
+       fprintf ( fMakefile, "# OBJECT MACROS\n" );
        if ( compilationUnits.size () > 0 )
        {
                for ( i = 0; i < compilationUnits.size (); i++ )
@@ -1022,7 +1029,7 @@ MingwModuleHandler::GetPrecompiledHeaderFilename () const
                                  module.pch->file->name + ".gch" );
 }
 
-Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",
+Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
 Rule arRule2 ( "\t$(ECHO_AR)\n"
@@ -1064,32 +1071,36 @@ Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc",
                "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
-                       "\t$(ECHO_WINEBLD)\n"
-                       "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
-                       "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n"
+Rule winebuildKMDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                                                 "\t$(ECHO_WINEBLD)\n"
+                                                 "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
+                                                 "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n\n",
+                                                 "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
+                                                 "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def",
+                                                 "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
+Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c:\n"
                        "\t${cp} $(NUL) $@ 1>$(NUL)\n"
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
                        "\t$(ECHO_CC)\n"
                        "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
                        "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
+                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c",
+                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o",
                        "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule winebuildDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                                               "\t$(ECHO_WINEBLD)\n"
+                                               "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(source)\n\n",
+                                               "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
+                                               "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def",
+                                               "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
+Rule winebuildRule (                      "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
                      "\t$(ECHO_WINEBLD)\n"
-                     "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n"
-                     "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
-                     "\t$(ECHO_WINEBLD)\n"
-                     "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n"
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                     "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n"
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
                      "\t$(ECHO_CC)\n"
                      "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c",
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
 Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n"
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
@@ -1281,6 +1292,8 @@ MingwModuleHandler::GenerateCommands (
        size_t i;
        Rule *customRule = NULL;
 
+       fprintf ( fMakefile, "# COMMANDS\n" );
+
        for ( i = 0; i < sizeof ( rules ) / sizeof ( rules[0] ); i++ )
        {
                if ( rules[i].host != HostDontCare && rules[i].host != ModuleHandlerInformations[module.type].DefaultHost )
@@ -1314,6 +1327,8 @@ MingwModuleHandler::GenerateCommands (
 void
 MingwModuleHandler::GenerateBuildMapCode ( const FileLocation *mapTarget )
 {
+       fprintf ( fMakefile, "# BUILD MAP CODE\n" );
+
        fprintf ( fMakefile,
                  "ifeq ($(ROS_BUILDMAP),full)\n" );
 
@@ -1351,6 +1366,8 @@ MingwModuleHandler::GenerateBuildMapCode ( const FileLocation *mapTarget )
 void
 MingwModuleHandler::GenerateBuildNonSymbolStrippedCode ()
 {
+       fprintf ( fMakefile, "# BUILD NO STRIP CODE\n" );
+
        fprintf ( fMakefile,
                  "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" );
 
@@ -1427,6 +1444,7 @@ MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const
 void
 MingwModuleHandler::GenerateRunRsymCode () const
 {
+       fprintf ( fMakefile, "# RUN RSYM CODE\n" );
        fprintf ( fMakefile,
              "ifneq ($(ROS_GENERATE_RSYM),no)\n" );
        fprintf ( fMakefile,
@@ -1440,6 +1458,7 @@ MingwModuleHandler::GenerateRunRsymCode () const
 void
 MingwModuleHandler::GenerateRunStripCode () const
 {
+       fprintf ( fMakefile, "# RUN STRIP CODE\n" );
        fprintf ( fMakefile,
                  "ifeq ($(ROS_LEAN_AND_MEAN),yes)\n" );
        fprintf ( fMakefile,
@@ -1462,6 +1481,8 @@ MingwModuleHandler::GenerateLinkerCommand (
        string objectsMacro = GetObjectsMacro ( module );
        string libsMacro = GetLibsMacro ();
 
+       fprintf ( fMakefile, "# LINKER COMMAND\n" );
+
        string target_macro ( GetTargetMacro ( module ) );
        string target_folder ( backend->GetFullPath ( *target_file ) );
 
@@ -1555,6 +1576,7 @@ MingwModuleHandler::GeneratePhonyTarget() const
        string targetMacro ( GetTargetMacro ( module ) );
        const FileLocation *target_file = GetTargetFilename ( module, NULL );
 
+       fprintf ( fMakefile, "# PHONY TARGET\n" );
        fprintf ( fMakefile,
                  ".PHONY: %s\n\n",
                  targetMacro.c_str ());
@@ -1571,6 +1593,8 @@ MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data )
        size_t i;
        string moduleDependencies;
 
+       fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" );
+
        const vector<CompilationUnit*>& compilationUnits = data.compilationUnits;
        for ( i = 0; i < compilationUnits.size (); i++ )
        {
@@ -1607,6 +1631,8 @@ MingwModuleHandler::GenerateObjectFileTargets ()
 {
        const FileLocation *pchFilename = GetPrecompiledHeaderFilename ();
 
+       fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" );
+
        if ( pchFilename )
        {
                string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" );
@@ -1646,10 +1672,17 @@ MingwModuleHandler::GenerateArchiveTarget ()
        const FileLocation *archiveFilename = GetModuleArchiveFilename ();
        const FileLocation *definitionFilename = GetDefinitionFilename ();
 
-       arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );
+       fprintf ( fMakefile, "# ARCHIVE TARGET\n" );
 
        if ( IsStaticLibrary ( module ) && definitionFilename )
        {
+               arRule1.Execute ( fMakefile,
+                                                 backend,
+                                                 module,
+                                                 archiveFilename,
+                                                 clean_files,
+                                                 backend->GetFullName ( *definitionFilename ).c_str () );
+
                fprintf ( fMakefile,
                          "\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n",
                          module.importLibrary->dllname.c_str (),
@@ -1657,6 +1690,8 @@ MingwModuleHandler::GenerateArchiveTarget ()
                          module.mangledSymbols ? "" : " --kill-at",
                          module.underscoreSymbols ? " --add-underscore" : "" );
        }
+       else
+               arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );
 
        if ( definitionFilename )
                delete definitionFilename;
@@ -1745,6 +1780,7 @@ MingwModuleHandler::GenerateObjectMacro ()
 void
 MingwModuleHandler::GenerateTargetMacro ()
 {
+       fprintf ( fMakefile, "# TARGET MACRO\n" );
        fprintf ( fMakefile,
                "%s := %s\n",
                GetTargetMacro ( module, false ).c_str (),
@@ -1806,6 +1842,8 @@ MingwModuleHandler::GenerateOtherMacros ()
 {
        set<const Define *> used_defs;
 
+       fprintf ( fMakefile, "# OTHER MACROS\n" );
+
        cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
        nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
        windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
@@ -1829,21 +1867,11 @@ MingwModuleHandler::GenerateOtherMacros ()
                        used_defs );
        }
 
-       vector<FileLocation> s;
-       if ( module.importLibrary )
-       {
-               const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits;
-               for ( size_t i = 0; i < compilationUnits.size (); i++ )
-               {
-                       CompilationUnit& compilationUnit = *compilationUnits[i];
-                       const FileLocation& sourceFile = compilationUnit.GetFilename ();
-                       string extension = GetExtension ( sourceFile );
-                       if ( extension == ".spec" || extension == ".SPEC" )
-                               GetSpecObjectDependencies ( s, &sourceFile );
-               }
-       }
-       if ( s.size () > 0 )
+       if ( IsWineModule() )
        {
+               vector<FileLocation> s;
+               GetSpecImplibDependencies ( s, module.importLibrary->source );
+
                fprintf (
                        fMakefile,
                        "%s +=",
@@ -1971,6 +1999,7 @@ MingwModuleHandler::GenerateOtherMacros ()
 void
 MingwModuleHandler::GenerateRules ()
 {
+       fprintf ( fMakefile, "# RULES\n" );
        string targetMacro = GetTargetMacro ( module );
        //CLEAN_FILE ( targetMacro );
        CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) );
@@ -1997,6 +2026,18 @@ MingwModuleHandler::GenerateRules ()
                delete ar_target;
        }
 
+       if ( IsWineModule() )
+       {
+               Rule * defRule;
+
+               if ( module.type == Kernel || module.type == KernelModeDLL || module.type == KernelModeDriver )
+                       defRule = &winebuildKMDefRule;
+               else
+                       defRule = &winebuildDefRule;
+
+               defRule->Execute ( fMakefile, backend, module, module.importLibrary->source, clean_files );
+       }
+
        GenerateObjectFileTargets ();
 }
 
@@ -2021,6 +2062,8 @@ MingwModuleHandler::GenerateInvocations () const
        if ( module.invocations.size () == 0 )
                return;
 
+       fprintf ( fMakefile, "# INVOCATIONS\n" );
+
        size_t iend = module.invocations.size ();
        for ( size_t i = 0; i < iend; i++ )
        {
@@ -2117,6 +2160,7 @@ MingwModuleHandler::GetDefaultDependencies (
 void
 MingwModuleHandler::GeneratePreconditionDependencies ()
 {
+       fprintf ( fMakefile, "# PRECONDITION DEPENDENCIES\n" );
        string preconditionDependenciesName = GetPreconditionDependenciesName ();
        string_list dependencies;
        GetDefaultDependencies ( dependencies );
@@ -2145,7 +2189,7 @@ MingwModuleHandler::IsWineModule () const
        if ( module.importLibrary == NULL)
                return false;
 
-       size_t index = module.importLibrary->source->name.rfind ( ".spec.def" );
+       size_t index = module.importLibrary->source->name.rfind ( ".spec" );
        return ( index != string::npos );
 }
 
@@ -2156,15 +2200,18 @@ MingwModuleHandler::GetDefinitionFilename () const
        if ( module.importLibrary == NULL )
                return NULL;
 
-       DirectoryLocation directory;
        if ( IsWineModule () )
-               directory = IntermediateDirectory;
+       {
+               return new FileLocation ( IntermediateDirectory,
+                                                                 module.importLibrary->source->relative_path,
+                                                                 GetBasename ( module.importLibrary->source->name ) + "_" + module.name + ".spec.def" );
+       }
        else
-               directory = SourceDirectory;
-
-       return new FileLocation ( directory,
-                                 module.importLibrary->source->relative_path,
-                                 module.importLibrary->source->name );
+       {
+               return new FileLocation ( SourceDirectory,
+                                                                 module.importLibrary->source->relative_path,
+                                                                 module.importLibrary->source->name );
+       }
 }
 
 void
@@ -2179,7 +2226,7 @@ MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
                vector<FileLocation> deps;
                GetDefinitionDependencies ( deps );
 
-               fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" );
+               fprintf ( fMakefile, "# IMPORT LIBRARY RULE\n" );
 
                fprintf ( fMakefile, "%s:",
                          backend->GetFullName ( *library_target ).c_str () );
@@ -2220,17 +2267,19 @@ MingwModuleHandler::GetSpecObjectDependencies (
        vector<FileLocation>& dependencies,
        const FileLocation *file ) const
 {
-       string basename = GetBasename ( file->name );
-
-       FileLocation defDependency ( IntermediateDirectory,
-                                    file->relative_path,
-                                    basename + ".spec.def" );
-       dependencies.push_back ( defDependency );
+       dependencies.push_back ( FileLocation ( IntermediateDirectory,
+                                                                                       file->relative_path,
+                                                                                       GetBasename ( file->name ) + "_" + module.name + ".stubs.c" ) );
+}
 
-       FileLocation stubsDependency ( IntermediateDirectory,
-                                      file->relative_path,
-                                    basename + ".stubs.c" );
-       dependencies.push_back ( stubsDependency );
+void
+MingwModuleHandler::GetSpecImplibDependencies (
+       vector<FileLocation>& dependencies,
+       const FileLocation *file ) const
+{
+       dependencies.push_back ( FileLocation ( IntermediateDirectory,
+                                                                                       file->relative_path,
+                                                                                       GetBasename ( file->name ) + "_" + module.name + ".spec.def" ) );
 }
 
 void
@@ -2337,6 +2386,8 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ()
 
        GenerateRules ();
 
+       fprintf ( fMakefile, "# BUILD TOOL MODULE TARGET\n" );
+
        string linker;
        if ( module.cplusplus )
                linker = "${host_gpp}";
@@ -2844,6 +2895,8 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
 
        GenerateRules ();
 
+       fprintf ( fMakefile, "# BOOT LOADER MODULE TARGET\n" );
+
        const FileLocation *target_file = GetTargetFilename ( module, NULL );
        fprintf ( fMakefile, "%s: %s %s | %s\n",
                  targetMacro.c_str (),
@@ -2920,6 +2973,8 @@ MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget ()
 
        GenerateRules ();
 
+       fprintf ( fMakefile, "# BOOT PROGRAM MODULE TARGET\n" );
+
        const FileLocation *target_file = GetTargetFilename ( module, NULL );
        fprintf ( fMakefile, "%s: %s %s %s | %s\n",
                  targetMacro.c_str (),
@@ -3094,6 +3149,7 @@ MingwIsoModuleHandler::GetCdFiles (
 void
 MingwIsoModuleHandler::GenerateIsoModuleTarget ()
 {
+       fprintf ( fMakefile, "# ISO MODULE TARGET\n" );
        string bootcdDirectory = "cd";
        FileLocation bootcd ( OutputDirectory,
                              bootcdDirectory,