[CMAKE]
authorJérôme Gardou <jerome.gardou@reactos.org>
Sat, 30 Oct 2010 16:08:19 +0000 (16:08 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Sat, 30 Oct 2010 16:08:19 +0000 (16:08 +0000)
  - rewrite spec2def macro because
1. cmake gracefully handles def files as source files
2. cmake gracefully handles autogenerated files as source
3. it did not take into account the fact that all shared libraries haven't the .dll extension

svn path=/branches/cmake-bringup/; revision=49358

365 files changed:
CMakeMacros.cmake
base/applications/kbswitch/kbsdll/CMakeLists.txt
base/applications/regedit/clb/CMakeLists.txt
dll/3rdparty/dxtn/CMakeLists.txt
dll/cpl/access/CMakeLists.txt
dll/cpl/appwiz/CMakeLists.txt
dll/cpl/console/CMakeLists.txt
dll/cpl/desk/CMakeLists.txt
dll/cpl/hdwwiz/CMakeLists.txt
dll/cpl/input/CMakeLists.txt
dll/cpl/intl/CMakeLists.txt
dll/cpl/joy/CMakeLists.txt
dll/cpl/main/CMakeLists.txt
dll/cpl/mmsys/CMakeLists.txt
dll/cpl/ncpa/CMakeLists.txt
dll/cpl/odbccp32/CMakeLists.txt
dll/cpl/powercfg/CMakeLists.txt
dll/cpl/sysdm/CMakeLists.txt
dll/cpl/telephon/CMakeLists.txt
dll/cpl/timedate/CMakeLists.txt
dll/cpl/usrmgr/CMakeLists.txt
dll/directx/amstream/CMakeLists.txt
dll/directx/d3d8thk/CMakeLists.txt
dll/directx/devenum/CMakeLists.txt
dll/directx/dinput/CMakeLists.txt
dll/directx/dinput8/CMakeLists.txt
dll/directx/dmusic/CMakeLists.txt
dll/directx/dplay/CMakeLists.txt
dll/directx/dsound/CMakeLists.txt
dll/directx/dxdiagn/CMakeLists.txt
dll/directx/ksproxy/CMakeLists.txt
dll/directx/ksuser/CMakeLists.txt
dll/directx/msdmo/CMakeLists.txt
dll/directx/qedit/CMakeLists.txt
dll/directx/quartz/CMakeLists.txt
dll/directx/wine/d3d8/CMakeLists.txt
dll/directx/wine/d3d9/CMakeLists.txt
dll/keyboard/kbda1/CMakeLists.txt
dll/keyboard/kbda2/CMakeLists.txt
dll/keyboard/kbda3/CMakeLists.txt
dll/keyboard/kbdal/CMakeLists.txt
dll/keyboard/kbdarme/CMakeLists.txt
dll/keyboard/kbdarmw/CMakeLists.txt
dll/keyboard/kbdaze/CMakeLists.txt
dll/keyboard/kbdazel/CMakeLists.txt
dll/keyboard/kbdbe/CMakeLists.txt
dll/keyboard/kbdbga/CMakeLists.txt
dll/keyboard/kbdbgm/CMakeLists.txt
dll/keyboard/kbdbgt/CMakeLists.txt
dll/keyboard/kbdblr/CMakeLists.txt
dll/keyboard/kbdbr/CMakeLists.txt
dll/keyboard/kbdbur/CMakeLists.txt
dll/keyboard/kbdcan/CMakeLists.txt
dll/keyboard/kbdcr/CMakeLists.txt
dll/keyboard/kbdcz/CMakeLists.txt
dll/keyboard/kbdcz1/CMakeLists.txt
dll/keyboard/kbdda/CMakeLists.txt
dll/keyboard/kbddv/CMakeLists.txt
dll/keyboard/kbdes/CMakeLists.txt
dll/keyboard/kbdest/CMakeLists.txt
dll/keyboard/kbdfc/CMakeLists.txt
dll/keyboard/kbdfi/CMakeLists.txt
dll/keyboard/kbdfr/CMakeLists.txt
dll/keyboard/kbdgeo/CMakeLists.txt
dll/keyboard/kbdgerg/CMakeLists.txt
dll/keyboard/kbdgneo/CMakeLists.txt
dll/keyboard/kbdgr/CMakeLists.txt
dll/keyboard/kbdgrist/CMakeLists.txt
dll/keyboard/kbdhe/CMakeLists.txt
dll/keyboard/kbdheb/CMakeLists.txt
dll/keyboard/kbdhu/CMakeLists.txt
dll/keyboard/kbdic/CMakeLists.txt
dll/keyboard/kbdinasa/CMakeLists.txt
dll/keyboard/kbdinben/CMakeLists.txt
dll/keyboard/kbdindev/CMakeLists.txt
dll/keyboard/kbdinguj/CMakeLists.txt
dll/keyboard/kbdinmal/CMakeLists.txt
dll/keyboard/kbdir/CMakeLists.txt
dll/keyboard/kbdit/CMakeLists.txt
dll/keyboard/kbdja/CMakeLists.txt
dll/keyboard/kbdkaz/CMakeLists.txt
dll/keyboard/kbdko/CMakeLists.txt
dll/keyboard/kbdla/CMakeLists.txt
dll/keyboard/kbdlt1/CMakeLists.txt
dll/keyboard/kbdlv/CMakeLists.txt
dll/keyboard/kbdmac/CMakeLists.txt
dll/keyboard/kbdne/CMakeLists.txt
dll/keyboard/kbdno/CMakeLists.txt
dll/keyboard/kbdpl1/CMakeLists.txt
dll/keyboard/kbdpo/CMakeLists.txt
dll/keyboard/kbdro/CMakeLists.txt
dll/keyboard/kbdru/CMakeLists.txt
dll/keyboard/kbdru1/CMakeLists.txt
dll/keyboard/kbdsg/CMakeLists.txt
dll/keyboard/kbdsk/CMakeLists.txt
dll/keyboard/kbdsk1/CMakeLists.txt
dll/keyboard/kbdsw/CMakeLists.txt
dll/keyboard/kbdtat/CMakeLists.txt
dll/keyboard/kbdth0/CMakeLists.txt
dll/keyboard/kbdth1/CMakeLists.txt
dll/keyboard/kbdth2/CMakeLists.txt
dll/keyboard/kbdth3/CMakeLists.txt
dll/keyboard/kbdtuf/CMakeLists.txt
dll/keyboard/kbdtuq/CMakeLists.txt
dll/keyboard/kbduk/CMakeLists.txt
dll/keyboard/kbdur/CMakeLists.txt
dll/keyboard/kbdurs/CMakeLists.txt
dll/keyboard/kbdus/CMakeLists.txt
dll/keyboard/kbdusa/CMakeLists.txt
dll/keyboard/kbdusl/CMakeLists.txt
dll/keyboard/kbdusr/CMakeLists.txt
dll/keyboard/kbdusx/CMakeLists.txt
dll/keyboard/kbduzb/CMakeLists.txt
dll/keyboard/kbdvntc/CMakeLists.txt
dll/keyboard/kbdycc/CMakeLists.txt
dll/keyboard/kbdycl/CMakeLists.txt
dll/nls/idndl/CMakeLists.txt
dll/shellext/deskadp/CMakeLists.txt
dll/shellext/deskmon/CMakeLists.txt
dll/shellext/devcpux/CMakeLists.txt
dll/shellext/fontext/CMakeLists.txt
dll/shellext/slayer/CMakeLists.txt
dll/win32/acledit/CMakeLists.txt
dll/win32/aclui/CMakeLists.txt
dll/win32/activeds/CMakeLists.txt
dll/win32/actxprxy/CMakeLists.txt
dll/win32/advpack/CMakeLists.txt
dll/win32/atl/CMakeLists.txt
dll/win32/authz/CMakeLists.txt
dll/win32/avicap32/CMakeLists.txt
dll/win32/avifil32/CMakeLists.txt
dll/win32/batt/CMakeLists.txt
dll/win32/bcrypt/CMakeLists.txt
dll/win32/beepmidi/CMakeLists.txt
dll/win32/browseui/CMakeLists.txt
dll/win32/cabinet/CMakeLists.txt
dll/win32/cards/CMakeLists.txt
dll/win32/cfgmgr32/CMakeLists.txt
dll/win32/clusapi/CMakeLists.txt
dll/win32/comcat/CMakeLists.txt
dll/win32/comctl32/CMakeLists.txt
dll/win32/comdlg32/CMakeLists.txt
dll/win32/compstui/CMakeLists.txt
dll/win32/credui/CMakeLists.txt
dll/win32/crtdll/CMakeLists.txt
dll/win32/crypt32/CMakeLists.txt
dll/win32/cryptdlg/CMakeLists.txt
dll/win32/cryptdll/CMakeLists.txt
dll/win32/cryptnet/CMakeLists.txt
dll/win32/cryptui/CMakeLists.txt
dll/win32/dbghelp/CMakeLists.txt
dll/win32/dciman32/CMakeLists.txt
dll/win32/devmgr/CMakeLists.txt
dll/win32/dhcpcsvc/CMakeLists.txt
dll/win32/dnsapi/CMakeLists.txt
dll/win32/dwmapi/CMakeLists.txt
dll/win32/faultrep/CMakeLists.txt
dll/win32/fmifs/CMakeLists.txt
dll/win32/fusion/CMakeLists.txt
dll/win32/gdiplus/CMakeLists.txt
dll/win32/getuname/CMakeLists.txt
dll/win32/glu32/CMakeLists.txt
dll/win32/hhctrl.ocx/CMakeLists.txt
dll/win32/hid/CMakeLists.txt
dll/win32/hlink/CMakeLists.txt
dll/win32/hnetcfg/CMakeLists.txt
dll/win32/httpapi/CMakeLists.txt
dll/win32/iccvid/CMakeLists.txt
dll/win32/icmp/CMakeLists.txt
dll/win32/imaadp32.acm/CMakeLists.txt
dll/win32/imagehlp/CMakeLists.txt
dll/win32/imm32/CMakeLists.txt
dll/win32/inetcomm/CMakeLists.txt
dll/win32/inetmib1/CMakeLists.txt
dll/win32/initpki/CMakeLists.txt
dll/win32/inseng/CMakeLists.txt
dll/win32/iphlpapi/CMakeLists.txt
dll/win32/iprtprio/CMakeLists.txt
dll/win32/itircl/CMakeLists.txt
dll/win32/itss/CMakeLists.txt
dll/win32/jscript/CMakeLists.txt
dll/win32/loadperf/CMakeLists.txt
dll/win32/localspl/CMakeLists.txt
dll/win32/localui/CMakeLists.txt
dll/win32/lpk/CMakeLists.txt
dll/win32/lsasrv/CMakeLists.txt
dll/win32/lz32/CMakeLists.txt
dll/win32/mapi32/CMakeLists.txt
dll/win32/mciavi32/CMakeLists.txt
dll/win32/mcicda/CMakeLists.txt
dll/win32/mciqtz32/CMakeLists.txt
dll/win32/mciseq/CMakeLists.txt
dll/win32/mciwave/CMakeLists.txt
dll/win32/mlang/CMakeLists.txt
dll/win32/mmdrv/CMakeLists.txt
dll/win32/modemui/CMakeLists.txt
dll/win32/mpr/CMakeLists.txt
dll/win32/mprapi/CMakeLists.txt
dll/win32/msacm32/CMakeLists.txt
dll/win32/msacm32/msacm32.drv/CMakeLists.txt
dll/win32/msadp32.acm/CMakeLists.txt
dll/win32/msafd/CMakeLists.txt
dll/win32/mscat32/CMakeLists.txt
dll/win32/mscms/CMakeLists.txt
dll/win32/mscoree/CMakeLists.txt
dll/win32/msctf/CMakeLists.txt
dll/win32/msftedit/CMakeLists.txt
dll/win32/msg711.acm/CMakeLists.txt
dll/win32/msgina/CMakeLists.txt
dll/win32/msgsm32.acm/CMakeLists.txt
dll/win32/mshtml.tlb/CMakeLists.txt
dll/win32/mshtml/CMakeLists.txt
dll/win32/msimg32/CMakeLists.txt
dll/win32/msimtf/CMakeLists.txt
dll/win32/msisip/CMakeLists.txt
dll/win32/msisys.ocx/CMakeLists.txt
dll/win32/msnet32/CMakeLists.txt
dll/win32/msrle32/CMakeLists.txt
dll/win32/mssign32/CMakeLists.txt
dll/win32/mssip32/CMakeLists.txt
dll/win32/mstask/CMakeLists.txt
dll/win32/msvcrt20/CMakeLists.txt
dll/win32/msvcrt40/CMakeLists.txt
dll/win32/msvfw32/CMakeLists.txt
dll/win32/msvidc32/CMakeLists.txt
dll/win32/mswsock/CMakeLists.txt
dll/win32/msxml3/CMakeLists.txt
dll/win32/nddeapi/CMakeLists.txt
dll/win32/netapi32/CMakeLists.txt
dll/win32/netcfgx/CMakeLists.txt
dll/win32/netevent/CMakeLists.txt
dll/win32/netid/CMakeLists.txt
dll/win32/netshell/CMakeLists.txt
dll/win32/newdev/CMakeLists.txt
dll/win32/ntdsapi/CMakeLists.txt
dll/win32/ntlanman/CMakeLists.txt
dll/win32/ntmarta/CMakeLists.txt
dll/win32/ntprint/CMakeLists.txt
dll/win32/objsel/CMakeLists.txt
dll/win32/odbc32/CMakeLists.txt
dll/win32/odbccp32/CMakeLists.txt
dll/win32/ole32/CMakeLists.txt
dll/win32/oleacc/CMakeLists.txt
dll/win32/oleaut32/CMakeLists.txt
dll/win32/olecli32/CMakeLists.txt
dll/win32/oledlg/CMakeLists.txt
dll/win32/olepro32/CMakeLists.txt
dll/win32/olesvr32/CMakeLists.txt
dll/win32/olethk32/CMakeLists.txt
dll/win32/opengl32/CMakeLists.txt
dll/win32/pdh/CMakeLists.txt
dll/win32/pidgen/CMakeLists.txt
dll/win32/powrprof/CMakeLists.txt
dll/win32/printui/CMakeLists.txt
dll/win32/psapi/CMakeLists.txt
dll/win32/pstorec/CMakeLists.txt
dll/win32/query/CMakeLists.txt
dll/win32/rasadhlp/CMakeLists.txt
dll/win32/rasapi32/CMakeLists.txt
dll/win32/rasdlg/CMakeLists.txt
dll/win32/rasman/CMakeLists.txt
dll/win32/resutils/CMakeLists.txt
dll/win32/riched20/CMakeLists.txt
dll/win32/riched32/CMakeLists.txt
dll/win32/rpcrt4/CMakeLists.txt
dll/win32/rsabase/CMakeLists.txt
dll/win32/rsaenh/CMakeLists.txt
dll/win32/samlib/CMakeLists.txt
dll/win32/samsrv/CMakeLists.txt
dll/win32/sccbase/CMakeLists.txt
dll/win32/schannel/CMakeLists.txt
dll/win32/secur32/CMakeLists.txt
dll/win32/security/CMakeLists.txt
dll/win32/sensapi/CMakeLists.txt
dll/win32/serialui/CMakeLists.txt
dll/win32/setupapi/CMakeLists.txt
dll/win32/sfc/CMakeLists.txt
dll/win32/sfc_os/CMakeLists.txt
dll/win32/shdoclc/CMakeLists.txt
dll/win32/shdocvw/CMakeLists.txt
dll/win32/shell32/CMakeLists.txt
dll/win32/shfolder/CMakeLists.txt
dll/win32/shimgvw/CMakeLists.txt
dll/win32/shlwapi/CMakeLists.txt
dll/win32/slbcsp/CMakeLists.txt
dll/win32/smdll/CMakeLists.txt
dll/win32/sndblst/CMakeLists.txt
dll/win32/snmpapi/CMakeLists.txt
dll/win32/softpub/CMakeLists.txt
dll/win32/spoolss/CMakeLists.txt
dll/win32/srclient/CMakeLists.txt
dll/win32/stdole2.tlb/CMakeLists.txt
dll/win32/stdole32.tlb/CMakeLists.txt
dll/win32/sti/CMakeLists.txt
dll/win32/sxs/CMakeLists.txt
dll/win32/syssetup/CMakeLists.txt
dll/win32/t2embed/CMakeLists.txt
dll/win32/tapi32/CMakeLists.txt
dll/win32/traffic/CMakeLists.txt
dll/win32/twain_32/CMakeLists.txt
dll/win32/uext2/CMakeLists.txt
dll/win32/ufat/CMakeLists.txt
dll/win32/ufatx/CMakeLists.txt
dll/win32/untfs/CMakeLists.txt
dll/win32/updspapi/CMakeLists.txt
dll/win32/url/CMakeLists.txt
dll/win32/urlmon/CMakeLists.txt
dll/win32/userenv/CMakeLists.txt
dll/win32/usp10/CMakeLists.txt
dll/win32/uxtheme/CMakeLists.txt
dll/win32/vdmdbg/CMakeLists.txt
dll/win32/version/CMakeLists.txt
dll/win32/wdmaud.drv/CMakeLists.txt
dll/win32/windowscodecs/CMakeLists.txt
dll/win32/winemp3.acm/CMakeLists.txt
dll/win32/winfax/CMakeLists.txt
dll/win32/wing32/CMakeLists.txt
dll/win32/winhttp/CMakeLists.txt
dll/win32/wininet/CMakeLists.txt
dll/win32/winmm/CMakeLists.txt
dll/win32/winmm/midimap/CMakeLists.txt
dll/win32/winspool/CMakeLists.txt
dll/win32/winsta/CMakeLists.txt
dll/win32/wintrust/CMakeLists.txt
dll/win32/wlanapi/CMakeLists.txt
dll/win32/wldap32/CMakeLists.txt
dll/win32/wmi/CMakeLists.txt
dll/win32/ws2_32/CMakeLists.txt
dll/win32/ws2_32_new/CMakeLists.txt
dll/win32/ws2help/CMakeLists.txt
dll/win32/wshirda/CMakeLists.txt
dll/win32/wshtcpip/CMakeLists.txt
dll/win32/wtsapi32/CMakeLists.txt
dll/win32/wuapi/CMakeLists.txt
dll/win32/xinput1_1/CMakeLists.txt
dll/win32/xinput1_2/CMakeLists.txt
dll/win32/xinput1_3/CMakeLists.txt
dll/win32/xinput9_1_0/CMakeLists.txt
dll/win32/xmllite/CMakeLists.txt
drivers/base/bootvid/CMakeLists.txt
drivers/base/kdcom/CMakeLists.txt
drivers/base/kddll/CMakeLists.txt
drivers/bus/pcix/CMakeLists.txt
drivers/directx/dxapi/CMakeLists.txt
drivers/directx/dxg/CMakeLists.txt
drivers/directx/dxgthk/CMakeLists.txt
drivers/ksfilter/ks/CMakeLists.txt
drivers/network/ndis/CMakeLists.txt
drivers/network/tcpip/CMakeLists.txt
drivers/network/tdi/CMakeLists.txt
drivers/storage/class/class2/CMakeLists.txt
drivers/storage/classpnp/CMakeLists.txt
drivers/storage/ide/pciidex/CMakeLists.txt
drivers/usb/usbd/CMakeLists.txt
drivers/video/displays/framebuf/CMakeLists.txt
drivers/video/displays/framebuf_new/CMakeLists.txt
drivers/video/displays/vga/CMakeLists.txt
drivers/video/videoprt/CMakeLists.txt
drivers/wdm/audio/backpln/portcls/CMakeLists.txt
drivers/wdm/audio/drm/drmk/CMakeLists.txt
drivers/wmi/CMakeLists.txt
lib/3rdparty/bzip2/CMakeLists.txt
ntoskrnl/CMakeLists.txt
subsystems/win32/csrss/csrsrv/CMakeLists.txt
subsystems/win32/csrss/win32csr/CMakeLists.txt

index 05558ea..54b8444 100644 (file)
@@ -41,16 +41,13 @@ MACRO(add_pch _target_name _header_filename _src_list)
 \r
 ENDMACRO(add_pch _target_name _header_filename _src_list)\r
 \r
-MACRO(spec2def _target_name _spec_file _def_file)\r
-\r
+MACRO(spec2def _dllname _spec_file)
+    get_filename_component(_file ${_spec_file} NAME_WE)\r
     add_custom_command(\r
-        OUTPUT ${_def_file}\r
-        COMMAND native-winebuild -o ${_def_file} --def -E ${_spec_file} --filename ${_target_name}.dll\r
-        DEPENDS native-winebuild)\r
-    set_source_files_properties(${_def_file} PROPERTIES GENERATED TRUE)\r
-    add_custom_target(${_target_name}_def ALL DEPENDS ${_def_file})\r
-\r
-ENDMACRO(spec2def _target_name _spec_file _def_file)\r
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
+        COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}\r
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
+ENDMACRO(spec2def _dllname _spec_file)\r
 \r
 if (NOT MSVC)\r
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
index 68810c1..5b39a02 100644 (file)
@@ -1,14 +1,13 @@
 
 set_unicode()
 
-add_library(kbsdll SHARED kbsdll.c kbsdll.rc)
+add_library(kbsdll SHARED kbsdll.c kbsdll.rc ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
 
-spec2def(kbsdll ${CMAKE_CURRENT_SOURCE_DIR}/kbsdll.spec ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
+spec2def(kbsdll.dll kbsdll.spec)
 
-target_link_libraries(kbsdll ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
+target_link_libraries(kbsdll)
 
 set_module_type(kbsdll win32dll)
 add_importlibs(kbsdll user32 comctl32 kernel32)
 
-add_dependencies(kbsdll kbsdll_def)
 add_cab_target(kbsdll 1)
index 817135e..e139177 100644 (file)
@@ -1,16 +1,16 @@
 
-spec2def(clb ${CMAKE_CURRENT_SOURCE_DIR}/clb.spec ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
+spec2def(clb.dll clb.spec)
 
 set_unicode()
 set_rc_compiler()
 
 add_library(clb SHARED
     clb.c
-    clb.rc)
+    clb.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
 
 set_module_type(clb win32dll)
 
-target_link_libraries(clb ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
-add_dependencies(clb clb_def)
+
 add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll)
     
\ No newline at end of file
index cf273d3..5f115b5 100644 (file)
@@ -1,18 +1,17 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-spec2def(dxtn ${CMAKE_CURRENT_SOURCE_DIR}/dxtn.spec ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def)
+spec2def(dxtn.dll dxtn.spec)
 
 add_library(dxtn SHARED
     fxt1.c
     dxtn.c
     wrapper.c
-    texstore.c)
+    texstore.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def)
 
 set_entrypoint(dxtn 0)
 
-target_link_libraries(dxtn ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def)
-
 add_importlibs(dxtn msvcrt)
 
-add_dependencies(dxtn dxtn_def psdk buildno_header)
+add_dependencies(dxtn psdk buildno_header)
index 71301db..e9e8992 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(access ${CMAKE_CURRENT_SOURCE_DIR}/access.spec ${CMAKE_CURRENT_BINARY_DIR}/access.def)
+spec2def(access.cpl access.spec)
 
 add_library(access SHARED
     access.c
@@ -10,12 +10,11 @@ add_library(access SHARED
     keyboard.c
     mouse.c
     sound.c
-    access.rc)
+    access.rc
+     ${CMAKE_CURRENT_BINARY_DIR}/access.def)
 
 set_module_type(access cpl)
 
-target_link_libraries(access ${CMAKE_CURRENT_BINARY_DIR}/access.def)
-
 add_importlibs(access
     msvcrt
     user32
@@ -24,5 +23,4 @@ add_importlibs(access
     comctl32
     kernel32)
 
-add_dependencies(access access_def)
 add_cab_target(access 1)
index e617fb2..0d2eb90 100644 (file)
@@ -1,16 +1,17 @@
 
 set_unicode()
 
-spec2def(appwiz ${CMAKE_CURRENT_SOURCE_DIR}/appwiz.spec ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def)
+spec2def(appwiz.cpl appwiz.spec)
 
 add_library(appwiz SHARED
     appwiz.c
     createlink.c
-    appwiz.rc)
+    appwiz.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def)
 
 set_module_type(appwiz cpl)
 
-target_link_libraries(appwiz ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def uuid)
+target_link_libraries(appwiz uuid)
 
 add_importlibs(appwiz
     msvcrt
@@ -21,5 +22,4 @@ add_importlibs(appwiz
     shell32
     kernel32)
 
-add_dependencies(appwiz appwiz_def)
 add_cab_target(appwiz 1)
index 9873433..e498349 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(console ${CMAKE_CURRENT_SOURCE_DIR}/console.spec ${CMAKE_CURRENT_BINARY_DIR}/console.def)
+spec2def(console.dll console.spec)
 
 list(APPEND SOURCE
     console.c
@@ -9,14 +9,13 @@ list(APPEND SOURCE
     font.c
     layout.c
     colors.c
-    console.rc)
+    console.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/console.def)
 
 add_library(console SHARED ${CMAKE_CURRENT_BINARY_DIR}/console_console.h.gch ${SOURCE})
 
 set_module_type(console win32dll)
 
-target_link_libraries(console ${CMAKE_CURRENT_BINARY_DIR}/console.def)
-
 add_importlibs(console
     msvcrt
     user32
@@ -25,5 +24,4 @@ add_importlibs(console
     kernel32)
 
 add_pch(console ${CMAKE_CURRENT_SOURCE_DIR}/console.h ${SOURCE})
-add_dependencies(console console_def)
 add_cab_target(console 1)
index a8eb3fe..bbafc53 100644 (file)
@@ -4,7 +4,7 @@ set_unicode()
 add_definitions(-D_WIN32)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-spec2def(desk ${CMAKE_CURRENT_SOURCE_DIR}/desk.spec ${CMAKE_CURRENT_BINARY_DIR}/desk.def)
+spec2def(desk.cpl desk.spec)
 
 add_library(desk SHARED
     advmon.c
@@ -24,11 +24,12 @@ add_library(desk SHARED
     general.c
     desk.rc
     draw.c
-    theme.c)
+    theme.c
+    ${CMAKE_CURRENT_BINARY_DIR}/desk.def)
 
 set_module_type(desk cpl)
 
-target_link_libraries(desk ${CMAKE_CURRENT_BINARY_DIR}/desk.def uuid)
+target_link_libraries(desk uuid)
 
 add_importlibs(desk
     msvcrt
@@ -44,5 +45,4 @@ add_importlibs(desk
     kernel32
     ntdll)
 
-add_dependencies(desk desk_def)
 add_cab_target(desk 1)
index 1a19221..bfc666e 100644 (file)
@@ -1,14 +1,12 @@
 
 set_unicode()
 
-spec2def(hdwwiz ${CMAKE_CURRENT_SOURCE_DIR}/hdwwiz.spec ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
+spec2def(hdwwiz.cpl hdwwiz.spec)
 
-add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc)
+add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
 
 set_module_type(hdwwiz cpl)
 
-target_link_libraries(hdwwiz ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
-
 add_importlibs(hdwwiz
     msvcrt
     setupapi
@@ -21,5 +19,4 @@ add_importlibs(hdwwiz
     kernel32
     ntdll)
 
-add_dependencies(hdwwiz hdwwiz_def)
 add_cab_target(hdwwiz 1)
index 3f33744..19e84ad 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(input ${CMAKE_CURRENT_SOURCE_DIR}/input.spec ${CMAKE_CURRENT_BINARY_DIR}/input.def)
+spec2def(input.dll input.spec)
 
 add_library(input SHARED
     input.c
@@ -9,12 +9,11 @@ add_library(input SHARED
     keysettings.c
     add.c
     changekeyseq.c
-    input.rc)
+    input.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/input.def)
 
 set_module_type(input win32dll)
 
-target_link_libraries(input ${CMAKE_CURRENT_BINARY_DIR}/input.def)
-
 add_importlibs(input
     msvcrt
     advapi32
@@ -23,5 +22,4 @@ add_importlibs(input
     gdi32
     kernel32)
 
-add_dependencies(input input_def)
 add_cab_target(input 1)
index 9a0d0f1..3a10202 100644 (file)
@@ -3,7 +3,7 @@ set_unicode()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-spec2def(intl ${CMAKE_CURRENT_SOURCE_DIR}/intl.spec ${CMAKE_CURRENT_BINARY_DIR}/intl.def)
+spec2def(intl.cpl intl.spec)
 
 add_library(intl SHARED
     currency.c
@@ -22,8 +22,6 @@ add_library(intl SHARED
 
 set_module_type(intl cpl)
 
-target_link_libraries(intl ${CMAKE_CURRENT_BINARY_DIR}/intl.def)
-
 add_importlibs(intl
     msvcrt
     user32
@@ -33,5 +31,4 @@ add_importlibs(intl
     shell32
     kernel32)
 
-add_dependencies(intl intl_def)
 add_cab_target(intl 1)
index bc5015f..bd99d4c 100644 (file)
@@ -1,13 +1,13 @@
 
 set_unicode()
 
-spec2def(joy ${CMAKE_CURRENT_SOURCE_DIR}/joy.spec ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
+spec2def(joy.cpl joy.spec)
 
-add_library(joy SHARED joy.c joy.rc)
+add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
 
 set_module_type(joy cpl)
 
-target_link_libraries(joy ${CMAKE_CURRENT_BINARY_DIR}/joy.def uuid)
+target_link_libraries(joy uuid)
 
 add_importlibs(joy
     user32
@@ -15,5 +15,4 @@ add_importlibs(joy
     ole32
     shell32)
 
-add_dependencies(joy joy_def)
 add_cab_target(joy 1)
index ac169e6..a2c1683 100644 (file)
@@ -3,18 +3,17 @@ set_unicode()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-spec2def(main ${CMAKE_CURRENT_SOURCE_DIR}/main.spec ${CMAKE_CURRENT_BINARY_DIR}/main.def)
+spec2def(main.cpl main.spec)
 
 add_library(main SHARED
     keyboard.c
     main.c
     mouse.c
-    main.rc)
+    main.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/main.def)
 
 set_module_type(main cpl)
 
-target_link_libraries(main ${CMAKE_CURRENT_BINARY_DIR}/main.def)
-
 add_importlibs(main
     msvcrt
     advapi32
@@ -26,5 +25,4 @@ add_importlibs(main
     gdi32
     kernel32)
 
-add_dependencies(main main_def)
 add_cab_target(main 1)
index 6e912f8..85c1ccb 100644 (file)
@@ -3,7 +3,7 @@ set_unicode()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-spec2def(mmsys ${CMAKE_CURRENT_SOURCE_DIR}/mmsys.spec ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
+spec2def(mmsys.cpl mmsys.spec)
 
 add_library(mmsys SHARED
     mmsys.c
@@ -11,12 +11,11 @@ add_library(mmsys SHARED
     volume.c
     audio.c
     voice.c
-    mmsys.rc)
+    mmsys.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
 
 set_module_type(mmsys cpl)
 
-target_link_libraries(mmsys ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
-
 add_importlibs(mmsys
     msvcrt
     user32
@@ -31,5 +30,4 @@ add_importlibs(mmsys
     ntdll
     kernel32)
 
-add_dependencies(mmsys mmsys_def)
 add_cab_target(mmsys 1)
index 86a3100..e1c41e8 100644 (file)
@@ -1,18 +1,15 @@
 
 set_unicode()
 
-spec2def(ncpa ${CMAKE_CURRENT_SOURCE_DIR}/ncpa.spec ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
+spec2def(ncpa.cpl ncpa.spec)
 
-add_library(ncpa SHARED ncpa.c)
+add_library(ncpa SHARED ncpa.c ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
 
 set_module_type(ncpa cpl)
 
-target_link_libraries(ncpa ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
-
 add_importlibs(ncpa
     msvcrt
     advapi32
     shell32)
 
-add_dependencies(ncpa ncpa_def)
 add_cab_target(ncpa 1)
index d482259..d1f23ca 100644 (file)
@@ -1,14 +1,11 @@
 
 set_unicode()
 
-spec2def(odbccp32i ${CMAKE_CURRENT_SOURCE_DIR}/odbccp32.spec ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
+spec2def(odbccp32i.cpl odbccp32.spec)
 
-add_library(odbccp32i SHARED odbccp32.c odbccp32.rc)
+add_library(odbccp32i SHARED odbccp32.c odbccp32.rc ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
 
 set_module_type(odbccp32i cpl)
 
-target_link_libraries(odbccp32i ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
-
 add_importlibs(odbccp32i user32 comctl32 kernel32)
-add_dependencies(odbccp32i odbccp32i_def)
 add_cab_target(odbccp32i 1)
index e438ad7..0f47d85 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(powercfg ${CMAKE_CURRENT_SOURCE_DIR}/powercfg.spec ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
+spec2def(powercfg.cpl powercfg.spec)
 
 add_library(powercfg SHARED
     powercfg.c
@@ -9,12 +9,12 @@ add_library(powercfg SHARED
     alarms.c
     advanced.c
     hibernate.c
-    powercfg.rc)
-
+    powercfg.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
 
 set_module_type(powercfg cpl)
 
-target_link_libraries(powercfg ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
+
 
 add_importlibs(powercfg
     msvcrt
@@ -25,5 +25,4 @@ add_importlibs(powercfg
     advapi32
     kernel32)
 
-add_dependencies(powercfg powercfg_def)
 add_cab_target(powercfg 1)
index 8634478..ec82bfb 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/sysdm.spec ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
+spec2def(sysdm.cpl sysdm.spec)
 
 list(APPEND SOURCE
     advanced.c
@@ -14,14 +14,13 @@ list(APPEND SOURCE
     sysdm.c
     userprofile.c
     virtmem.c
-    sysdm.rc)
+    sysdm.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
 
 add_library(sysdm SHARED ${CMAKE_CURRENT_BINARY_DIR}/sysdm_precomp.h.gch ${SOURCE})
 
 set_module_type(sysdm cpl)
 
-target_link_libraries(sysdm ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
-
 add_importlibs(sysdm
     msvcrt
     advapi32
@@ -37,5 +36,4 @@ add_importlibs(sysdm
     kernel32)
 
 add_pch(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(sysdm sysdm_def)
 add_cab_target(sysdm 1)
index d04b2d8..4970c6a 100644 (file)
@@ -1,13 +1,13 @@
 
 set_unicode()
 
-spec2def(telephon ${CMAKE_CURRENT_SOURCE_DIR}/telephon.spec ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
+spec2def(telephon.cpl telephon.spec)
 
-add_library(telephon SHARED telephon.c telephon.rc)
+add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
 
 set_module_type(telephon cpl)
 
-target_link_libraries(telephon ${CMAKE_CURRENT_BINARY_DIR}/telephon.def uuid)
+target_link_libraries(telephon uuid)
 
 add_importlibs(telephon
     advapi32
@@ -17,5 +17,4 @@ add_importlibs(telephon
     shell32
     kernel32)
 
-add_dependencies(telephon telephon_def)
 add_cab_target(telephon 1)
index 57caf37..8c656c5 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(timedate ${CMAKE_CURRENT_SOURCE_DIR}/timedate.spec ${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
+spec2def(timedate.cpl timedate.spec)
 
 add_library(timedate SHARED
     clock.c
@@ -11,12 +11,11 @@ add_library(timedate SHARED
     ntpclient.c
     timedate.c
     timezone.c
-    timedate.rc)
+    timedate.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
 
 set_module_type(timedate cpl)
 
-target_link_libraries(timedate ${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
-
 add_importlibs(timedate
     advapi32
     user32
@@ -27,5 +26,4 @@ add_importlibs(timedate
     msvcrt
     kernel32)
 
-add_dependencies(timedate timedate_def)
 add_cab_target(timedate 1)
index 7889ed1..c71fc65 100644 (file)
@@ -3,7 +3,7 @@ set_unicode()
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(usrmgr ${CMAKE_CURRENT_SOURCE_DIR}/usrmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
+spec2def(usrmgr.cpl usrmgr.spec)
 
 add_library(usrmgr SHARED
     extra.c
@@ -13,12 +13,11 @@ add_library(usrmgr SHARED
     userprops.c
     users.c
     usrmgr.c
-    usrmgr.rc)
+    usrmgr.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
 
 set_module_type(usrmgr cpl)
 
-target_link_libraries(usrmgr ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
-
 add_importlibs(usrmgr
     advapi32
     user32
@@ -29,5 +28,5 @@ add_importlibs(usrmgr
     kernel32
     ntdll)
 
-add_dependencies(usrmgr usrmgr_def)
+
 add_cab_target(usrmgr 1)
index 079efd0..e2bc6a2 100644 (file)
@@ -4,7 +4,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(amstream ${CMAKE_CURRENT_SOURCE_DIR}/amstream.spec ${CMAKE_CURRENT_BINARY_DIR}/amstream.def)
+spec2def(amstream.dll amstream.spec)
 
 add_library(amstream SHARED
     amstream.c
@@ -13,12 +13,12 @@ add_library(amstream SHARED
     mediastreamfilter.c
     regsvr.c
     amstream_i.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/amstream.def)
 
 set_module_type(amstream win32dll)
 
 target_link_libraries(amstream
-    ${CMAKE_CURRENT_BINARY_DIR}/amstream.def
     strmiids
     uuid
     wine)
@@ -29,5 +29,5 @@ add_importlibs(amstream
     kernel32
     ntdll)
 
-add_dependencies(amstream amstream_def dxsdk)
+add_dependencies(amstream dxsdk)
 add_cab_target(amstream 1)
index 767e8df..c83c0b8 100644 (file)
@@ -1,12 +1,10 @@
 
-spec2def(d3d8thk ${CMAKE_CURRENT_SOURCE_DIR}/d3d8thk.spec ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)
+spec2def(d3d8thk.dll d3d8thk.spec)
 
-add_library(d3d8thk SHARED d3d8thk.rc)
+add_library(d3d8thk SHARED d3d8thk.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)
 
 set_entrypoint(d3d8thk 0)
 
-target_link_libraries(d3d8thk ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)
-
 add_importlibs(d3d8thk gdi32)
 
-add_dependencies(d3d8thk d3d8thk_def psdk buildno_header)
+add_dependencies(d3d8thk psdk buildno_header)
index 4e0a7a1..bbaff11 100644 (file)
@@ -5,7 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(devenum ${CMAKE_CURRENT_SOURCE_DIR}/devenum.spec ${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
+spec2def(devenum.dll devenum.spec)
 
 add_library(devenum SHARED
     createdevenum.c
@@ -13,12 +13,12 @@ add_library(devenum SHARED
     factory.c
     mediacatenum.c
     parsedisplayname.c
-    devenum.rc)
+    devenum.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
 
 set_module_type(devenum win32dll)
 
 target_link_libraries(devenum
-    ${CMAKE_CURRENT_BINARY_DIR}/devenum.def
     strmiids
     uuid
     wine)
@@ -33,5 +33,5 @@ add_importlibs(devenum
     kernel32
     ntdll)
 
-add_dependencies(devenum devenum_def)
+
 add_cab_target(devenum 1)
index 26a3461..6d901d5 100644 (file)
@@ -5,7 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dinput ${CMAKE_CURRENT_SOURCE_DIR}/dinput.spec ${CMAKE_CURRENT_BINARY_DIR}/dinput.def)
+spec2def(dinput.dll dinput.spec)
 
 add_library(dinput SHARED
     data_formats.c
@@ -17,12 +17,12 @@ add_library(dinput SHARED
     keyboard.c
     mouse.c
     regsvr.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dinput.def)
 
 set_module_type(dinput win32dll)
 
 target_link_libraries(dinput
-    ${CMAKE_CURRENT_BINARY_DIR}/dinput.def
     dxguid
     uuid
     wine)
@@ -35,5 +35,5 @@ add_importlibs(dinput
     kernel32
     ntdll)
 
-add_dependencies(dinput dinput_def)
+
 add_cab_target(dinput 1)
index 442f5a5..fa1dea8 100644 (file)
@@ -5,17 +5,17 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dinput8 ${CMAKE_CURRENT_SOURCE_DIR}/dinput8.spec ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)
+spec2def(dinput8.dll dinput8.spec)
 
 add_library(dinput8 SHARED
     dinput8_main.c
     regsvr.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)
 
 set_entrypoint(dinput8 0)
 
 target_link_libraries(dinput8
-    ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def
     dxguid
     uuid
     wine)
@@ -29,4 +29,4 @@ add_importlibs(dinput8
     kernel32
     ntdll)
 
-add_dependencies(dinput8 dinput8_def psdk buildno_header)
+add_dependencies(dinput8 psdk buildno_header)
index b465d49..d259a9b 100644 (file)
@@ -6,7 +6,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dmusic ${CMAKE_CURRENT_SOURCE_DIR}/dmusic.spec ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
+spec2def(dmusic.dll dmusic.spec)
 
 add_library(dmusic SHARED
     buffer.c
@@ -19,12 +19,12 @@ add_library(dmusic SHARED
     instrument.c
     port.c
     regsvr.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
 
 set_entrypoint(dmusic 0)
 
 target_link_libraries(dmusic
-    ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def
     dxguid
     uuid
     wine)
@@ -37,4 +37,4 @@ add_importlibs(dmusic
     kernel32
     ntdll)
 
-add_dependencies(dmusic dmusic_def psdk buildno_header)
+add_dependencies(dmusic psdk buildno_header)
index 7f7d1cf..201e811 100644 (file)
@@ -3,14 +3,13 @@ set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dplay ${CMAKE_CURRENT_SOURCE_DIR}/dplay.spec ${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
+spec2def(dplay.dll dplay.spec)
 
-add_library(dplay SHARED dplay_main.c version.rc)
+add_library(dplay SHARED dplay_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
 
 set_entrypoint(dplay 0)
 
 target_link_libraries(dplay
-    ${CMAKE_CURRENT_BINARY_DIR}/dplay.def
     uuid
     wine)
 
@@ -22,4 +21,4 @@ add_importlibs(dplay
     dinput
     ntdll)
 
-add_dependencies(dplay dplay_def psdk buildno_header)
+add_dependencies(dplay psdk buildno_header)
index f908ec4..c677d83 100644 (file)
@@ -3,7 +3,7 @@ add_definitions(-D_WINE)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dsound ${CMAKE_CURRENT_SOURCE_DIR}/dsound.spec ${CMAKE_CURRENT_BINARY_DIR}/dsound.def)
+spec2def(dsound.dll dsound.spec)
 
 add_library(dsound SHARED
     buffer.c
@@ -17,12 +17,12 @@ add_library(dsound SHARED
     propset.c
     regsvr.c
     sound3d.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dsound.def)
 
 set_module_type(dsound win32dll)
 
 target_link_libraries(dsound
-    ${CMAKE_CURRENT_BINARY_DIR}/dsound.def
     dxguid
     uuid
     wine)
@@ -36,5 +36,5 @@ add_importlibs(dsound
     kernel32
     ntdll)
 
-add_dependencies(dsound dsound_def)
+
 add_cab_target(dsound 1)
index e927a4c..f8c5b06 100644 (file)
@@ -3,18 +3,18 @@ set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dxdiagn ${CMAKE_CURRENT_SOURCE_DIR}/dxdiagn.spec ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
+spec2def(dxdiagn.dll dxdiagn.spec)
 
 add_library(dxdiagn SHARED
     container.c
     dxdiag_main.c
     provider.c
-    regsvr.c)
+    regsvr.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
 
 set_module_type(dxdiagn win32dll)
 
 target_link_libraries(dxdiagn
-    ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def
     uuid
     wine)
 
@@ -26,5 +26,4 @@ add_importlibs(dxdiagn
     kernel32
     ntdll)
 
-add_dependencies(dxdiagn dxdiagn_def)
 add_cab_target(dxdiagn 1)
index 3731a32..dd2d790 100644 (file)
@@ -1,5 +1,5 @@
 
-spec2def(ksproxy ${CMAKE_CURRENT_SOURCE_DIR}/ksproxy.spec ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)
+spec2def(ksproxy.ax ksproxy.spec)
 
 add_library(ksproxy SHARED
     allocator.cpp
@@ -19,7 +19,8 @@ add_library(ksproxy SHARED
     node.cpp
     output_pin.cpp
     proxy.cpp
-    qualityforward.cpp)
+    qualityforward.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)
 
 set_entrypoint(ksproxy 0)
 set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
@@ -30,7 +31,7 @@ else()
 endif(MSVC)
 
 
-target_link_libraries(ksproxy ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def strmiids)
+target_link_libraries(ksproxy strmiids)
 
 add_importlibs(ksproxy
     advapi32
@@ -40,4 +41,4 @@ add_importlibs(ksproxy
     ksuser
     ntdll)
 
-add_dependencies(ksproxy ksproxy_def psdk buildno_header)
+add_dependencies(ksproxy psdk buildno_header)
index 901368b..2da6e39 100644 (file)
@@ -1,12 +1,10 @@
 
-spec2def(ksuser ${CMAKE_CURRENT_SOURCE_DIR}/ksuser.spec ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
+spec2def(ksuser.dll ksuser.spec)
 
-add_library(ksuser SHARED ksuser.c ksuser.rc)
+add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
 
 set_module_type(ksuser win32dll)
 
-target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
-
 add_importlibs(ksuser advapi32 kernel32 ntdll)
-add_dependencies(ksuser ksuser_def psdk bugcodes)
+add_dependencies(ksuser psdk bugcodes)
 add_cab_target(ksuser 1)
index c21f1d5..3309b8f 100644 (file)
@@ -4,12 +4,13 @@ set_unicode()
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msdmo ${CMAKE_CURRENT_SOURCE_DIR}/msdmo.spec ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def)
+spec2def(msdmo.dll msdmo.spec)
 
 add_library(msdmo SHARED
     dmoreg.c
     dmort.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def)
 
 set_entrypoint(msdmo 0)
 
@@ -25,4 +26,4 @@ add_importlibs(msdmo
     kernel32
     ntdll)
 
-add_dependencies(msdmo msdmo_def dxdsk psdk buildno_header)
+add_dependencies(msdmo dxdsk psdk buildno_header)
index d81456d..7989a84 100644 (file)
@@ -7,18 +7,18 @@ add_definitions(-D_WIN32_WINNT=0x600)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(qedit ${CMAKE_CURRENT_SOURCE_DIR}/qedit.spec ${CMAKE_CURRENT_BINARY_DIR}/qedit.def)
+spec2def(qedit.dll qedit.spec)
 
 add_library(qedit SHARED
     main.c
     mediadet.c
     regsvr.c
-    samplegrabber.c)
+    samplegrabber.c
+    ${CMAKE_CURRENT_BINARY_DIR}/qedit.def)
 
 set_module_type(qedit win32dll)
 
 target_link_libraries(qedit
-    ${CMAKE_CURRENT_BINARY_DIR}/qedit.def
     strmiids
     uuid
     wine)
@@ -31,5 +31,5 @@ add_importlibs(qedit
     kernel32
     ntdll)
 
-add_dependencies(qedit qedit_def dxsdk)
+add_dependencies(qedit dxsdk)
 add_cab_target(qedit 1)
index 81e72f9..91f6ef6 100644 (file)
@@ -12,7 +12,7 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(quartz ${CMAKE_CURRENT_SOURCE_DIR}/quartz.spec ${CMAKE_CURRENT_BINARY_DIR}/quartz.def)
+spec2def(quartz.dll quartz.spec)
 
 add_library(quartz SHARED
     avidec.c
@@ -39,7 +39,8 @@ add_library(quartz SHARED
     enummedia.c
     control.c
     avisplit.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/quartz.def)
 
 set_module_type(quartz win32dll)
 
@@ -67,6 +68,6 @@ add_importlibs(quartz
     kernel32
     ntdll)
 
-add_dependencies(quartz quartz_def)
+
 rpcproxy(quartz quartz_strmif.idl)
 add_cab_target(quartz 1)
index cc339c4..570fd18 100644 (file)
@@ -5,7 +5,7 @@ add_definitions(-D__WINESRC__)
 add_definitions(-DUSE_WIN32_OPENGL)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(d3d8 ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.spec ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
+spec2def(d3d8.dll d3d8.spec)
 
 add_library(d3d8 SHARED
     cubetexture.c
@@ -22,12 +22,12 @@ add_library(d3d8 SHARED
     vertexshader.c
     volume.c
     volumetexture.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
 
 set_module_type(d3d8 win32dll)
 
 target_link_libraries(d3d8
-    ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def
     uuid
     wine)
 
@@ -37,5 +37,5 @@ add_importlibs(d3d8
     advapi32
     wined3d)
 
-add_dependencies(d3d8 d3d8_def wineheaders)
+add_dependencies(d3d8 wineheaders)
 add_cab_target(d3d8 1)
index e87ed9b..6ed3f8d 100644 (file)
@@ -5,7 +5,7 @@ add_definitions(-D__WINESRC__)
 add_definitions(-DUSE_WIN32_OPENGL)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(d3d9 ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.spec ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
+spec2def(d3d9.dll d3d9.spec)
 
 add_library(d3d9 SHARED
     cubetexture.c
@@ -24,12 +24,12 @@ add_library(d3d9 SHARED
     vertexshader.c
     volume.c
     volumetexture.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
 
 set_module_type(d3d9 win32dll)
 
 target_link_libraries(d3d9
-    ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def
     uuid
     wine)
 
@@ -39,5 +39,5 @@ add_importlibs(d3d9
     advapi32
     wined3d)
 
-add_dependencies(d3d9 d3d9_def wineheaders)
+add_dependencies(d3d9 wineheaders)
 add_cab_target(d3d9 1)
index 88979a6..acb25f5 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbda1 ${CMAKE_CURRENT_SOURCE_DIR}/kbda1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbda1.def)
+spec2def(kbda1.dll kbda1.spec)
 
-add_library(kbda1 SHARED kbda1.c kbda1.rc)
+add_library(kbda1 SHARED kbda1.c kbda1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda1.def)
 
 set_entrypoint(kbda1 0)
 
-target_link_libraries(kbda1 ${CMAKE_CURRENT_BINARY_DIR}/kbda1.def)
-
-add_dependencies(kbda1 kbda1_def psdk buildno_header)
+add_dependencies(kbda1 psdk buildno_header)
index 0c1f473..33d3fcc 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbda2 ${CMAKE_CURRENT_SOURCE_DIR}/kbda2.spec ${CMAKE_CURRENT_BINARY_DIR}/kbda2.def)
+spec2def(kbda2.dll kbda2.spec)
 
-add_library(kbda2 SHARED kbda2.c kbda2.rc)
+add_library(kbda2 SHARED kbda2.c kbda2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda2.def)
 
 set_entrypoint(kbda2 0)
 
-target_link_libraries(kbda2 ${CMAKE_CURRENT_BINARY_DIR}/kbda2.def)
-
-add_dependencies(kbda2 kbda2_def psdk buildno_header)
+add_dependencies(kbda2 psdk buildno_header)
index 0abd8fe..4fceb5a 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbda3 ${CMAKE_CURRENT_SOURCE_DIR}/kbda3.spec ${CMAKE_CURRENT_BINARY_DIR}/kbda3.def)
+spec2def(kbda3.dll kbda3.spec)
 
-add_library(kbda3 SHARED kbda3.c kbda3.rc)
+add_library(kbda3 SHARED kbda3.c kbda3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda3.def)
 
 set_entrypoint(kbda3 0)
 
-target_link_libraries(kbda3 ${CMAKE_CURRENT_BINARY_DIR}/kbda3.def)
-
-add_dependencies(kbda3 kbda3_def psdk buildno_header)
+add_dependencies(kbda3 psdk buildno_header)
index f9191c5..aa68167 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdal ${CMAKE_CURRENT_SOURCE_DIR}/kbdal.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdal.def)
+spec2def(kbdal.dll kbdal.spec)
 
-add_library(kbdal SHARED kbdal.c kbdal.rc)
+add_library(kbdal SHARED kbdal.c kbdal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdal.def)
 
 set_entrypoint(kbdal 0)
 
-target_link_libraries(kbdal ${CMAKE_CURRENT_BINARY_DIR}/kbdal.def)
-
-add_dependencies(kbdal kbdal_def psdk buildno_header)
+add_dependencies(kbdal psdk buildno_header)
index 42692b8..54ee9bd 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdarme ${CMAKE_CURRENT_SOURCE_DIR}/kbdarme.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdarme.def)
+spec2def(kbdarme.dll kbdarme.spec)
 
-add_library(kbdarme SHARED kbdarme.c kbdarme.rc)
+add_library(kbdarme SHARED kbdarme.c kbdarme.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarme.def)
 
 set_entrypoint(kbdarme 0)
 
-target_link_libraries(kbdarme ${CMAKE_CURRENT_BINARY_DIR}/kbdarme.def)
-
-add_dependencies(kbdarme kbdarme_def psdk buildno_header)
+add_dependencies(kbdarme psdk buildno_header)
index ce70b00..1e9aaf2 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdarmw ${CMAKE_CURRENT_SOURCE_DIR}/kbdarmw.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdarmw.def)
+spec2def(kbdarmw.dll kbdarmw.spec)
 
-add_library(kbdarmw SHARED kbdarmw.c kbdarmw.rc)
+add_library(kbdarmw SHARED kbdarmw.c kbdarmw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarmw.def)
 
 set_entrypoint(kbdarmw 0)
 
-target_link_libraries(kbdarmw ${CMAKE_CURRENT_BINARY_DIR}/kbdarmw.def)
-
-add_dependencies(kbdarmw kbdarmw_def psdk buildno_header)
+add_dependencies(kbdarmw psdk buildno_header)
index efe68ac..4fd523b 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdaze ${CMAKE_CURRENT_SOURCE_DIR}/kbdaze.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdaze.def)
+spec2def(kbdaze.dll kbdaze.spec)
 
-add_library(kbdaze SHARED kbdaze.c kbdaze.rc)
+add_library(kbdaze SHARED kbdaze.c kbdaze.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdaze.def)
 
 set_entrypoint(kbdaze 0)
 
-target_link_libraries(kbdaze ${CMAKE_CURRENT_BINARY_DIR}/kbdaze.def)
-
-add_dependencies(kbdaze kbdaze_def psdk buildno_header)
+add_dependencies(kbdaze psdk buildno_header)
index fbbf6fa..452f41a 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdazel ${CMAKE_CURRENT_SOURCE_DIR}/kbdazel.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdazel.def)
+spec2def(kbdazel.dll kbdazel.spec)
 
-add_library(kbdazel SHARED kbdazel.c kbdazel.rc)
+add_library(kbdazel SHARED kbdazel.c kbdazel.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdazel.def)
 
 set_entrypoint(kbdazel 0)
 
-target_link_libraries(kbdazel ${CMAKE_CURRENT_BINARY_DIR}/kbdazel.def)
-
-add_dependencies(kbdazel kbdazel_def psdk buildno_header)
+add_dependencies(kbdazel psdk buildno_header)
index 1170f92..0143aeb 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdbe ${CMAKE_CURRENT_SOURCE_DIR}/kbdbe.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdbe.def)
+spec2def(kbdbe.dll kbdbe.spec)
 
-add_library(kbdbe SHARED kbdbe.c kbdbe.rc)
+add_library(kbdbe SHARED kbdbe.c kbdbe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbe.def)
 
 set_entrypoint(kbdbe 0)
 
-target_link_libraries(kbdbe ${CMAKE_CURRENT_BINARY_DIR}/kbdbe.def)
-
-add_dependencies(kbdbe kbdbe_def psdk buildno_header)
+add_dependencies(kbdbe psdk buildno_header)
index c739b06..b874fb5 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdbga ${CMAKE_CURRENT_SOURCE_DIR}/kbdbga.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdbga.def)
+spec2def(kbdbga.dll kbdbga.spec)
 
-add_library(kbdbga SHARED kbdbga.c kbdbga.rc)
+add_library(kbdbga SHARED kbdbga.c kbdbga.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbga.def)
 
 set_entrypoint(kbdbga 0)
 
-target_link_libraries(kbdbga ${CMAKE_CURRENT_BINARY_DIR}/kbdbga.def)
-
-add_dependencies(kbdbga kbdbga_def psdk buildno_header)
+add_dependencies(kbdbga psdk buildno_header)
index 7492aa8..e178e36 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdbgm ${CMAKE_CURRENT_SOURCE_DIR}/kbdbgm.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdbgm.def)
+spec2def(kbdbgm.dll kbdbgm.spec)
 
-add_library(kbdbgm SHARED kbdbgm.c kbdbgm.rc)
+add_library(kbdbgm SHARED kbdbgm.c kbdbgm.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgm.def)
 
 set_entrypoint(kbdbgm 0)
 
-target_link_libraries(kbdbgm ${CMAKE_CURRENT_BINARY_DIR}/kbdbgm.def)
-
-add_dependencies(kbdbgm kbdbgm_def psdk buildno_header)
+add_dependencies(kbdbgm psdk buildno_header)
index 731fbfc..e028206 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdbgt ${CMAKE_CURRENT_SOURCE_DIR}/kbdbgt.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdbgt.def)
+spec2def(kbdbgt.dll kbdbgt.spec)
 
-add_library(kbdbgt SHARED kbdbgt.c kbdbgt.rc)
+add_library(kbdbgt SHARED kbdbgt.c kbdbgt.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgt.def)
 
 set_entrypoint(kbdbgt 0)
 
-target_link_libraries(kbdbgt ${CMAKE_CURRENT_BINARY_DIR}/kbdbgt.def)
-
-add_dependencies(kbdbgt kbdbgt_def psdk buildno_header)
+add_dependencies(kbdbgt psdk buildno_header)
index 4b9d4c8..60ed391 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdblr ${CMAKE_CURRENT_SOURCE_DIR}/kbdblr.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdblr.def)
+spec2def(kbdblr.dll kbdblr.spec)
 
-add_library(kbdblr SHARED kbdblr.c kbdblr.rc)
+add_library(kbdblr SHARED kbdblr.c kbdblr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdblr.def)
 
 set_entrypoint(kbdblr 0)
 
-target_link_libraries(kbdblr ${CMAKE_CURRENT_BINARY_DIR}/kbdblr.def)
 
-add_dependencies(kbdblr kbdblr_def psdk buildno_header)
+
+add_dependencies(kbdblr psdk buildno_header)
index 4c4309d..b682550 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdbr ${CMAKE_CURRENT_SOURCE_DIR}/kbdbr.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdbr.def)
+spec2def(kbdbr.dll kbdbr.spec)
 
-add_library(kbdbr SHARED kbdbr.c kbdbr.rc)
+add_library(kbdbr SHARED kbdbr.c kbdbr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbr.def)
 
 set_entrypoint(kbdbr 0)
 
-target_link_libraries(kbdbr ${CMAKE_CURRENT_BINARY_DIR}/kbdbr.def)
-
-add_dependencies(kbdbr kbdbr_def psdk buildno_header)
+add_dependencies(kbdbr psdk buildno_header)
index d03f4b8..57e53b2 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdbur ${CMAKE_CURRENT_SOURCE_DIR}/kbdbur.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdbur.def)
+spec2def(kbdbur.dll kbdbur.spec)
 
-add_library(kbdbur SHARED kbdbur.c kbdbur.rc)
+add_library(kbdbur SHARED kbdbur.c kbdbur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbur.def)
 
 set_entrypoint(kbdbur 0)
 
-target_link_libraries(kbdbur ${CMAKE_CURRENT_BINARY_DIR}/kbdbur.def)
 
-add_dependencies(kbdbur kbdbur_def psdk buildno_header)
+
+add_dependencies(kbdbur psdk buildno_header)
index e5067d2..d26637f 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdcan ${CMAKE_CURRENT_SOURCE_DIR}/kbdcan.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdcan.def)
+spec2def(kbdcan.dll kbdcan.spec)
 
-add_library(kbdcan SHARED kbdcan.c kbdcan.rc)
+add_library(kbdcan SHARED kbdcan.c kbdcan.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcan.def)
 
 set_entrypoint(kbdcan 0)
 
-target_link_libraries(kbdcan ${CMAKE_CURRENT_BINARY_DIR}/kbdcan.def)
 
-add_dependencies(kbdcan kbdcan_def psdk buildno_header)
+
+add_dependencies(kbdcan psdk buildno_header)
index 44a5a61..8f94bff 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdcr ${CMAKE_CURRENT_SOURCE_DIR}/kbdcr.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdcr.def)
+spec2def(kbdcr.dll kbdcr.spec)
 
-add_library(kbdcr SHARED kbdcr.c kbdcr.rc)
+add_library(kbdcr SHARED kbdcr.c kbdcr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcr.def)
 
 set_entrypoint(kbdcr 0)
 
-target_link_libraries(kbdcr ${CMAKE_CURRENT_BINARY_DIR}/kbdcr.def)
 
-add_dependencies(kbdcr kbdcr_def psdk buildno_header)
+
+add_dependencies(kbdcr psdk buildno_header)
index 4c8a66e..80276df 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdcz ${CMAKE_CURRENT_SOURCE_DIR}/kbdcz.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdcz.def)
+spec2def(kbdcz.dll kbdcz.spec)
 
-add_library(kbdcz SHARED kbdcz.c kbdcz.rc)
+add_library(kbdcz SHARED kbdcz.c kbdcz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz.def)
 
 set_entrypoint(kbdcz 0)
 
-target_link_libraries(kbdcz ${CMAKE_CURRENT_BINARY_DIR}/kbdcz.def)
 
-add_dependencies(kbdcz kbdcz_def psdk buildno_header)
+
+add_dependencies(kbdcz psdk buildno_header)
index efba75e..03f8e26 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdcz1 ${CMAKE_CURRENT_SOURCE_DIR}/kbdcz1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdcz1.def)
+spec2def(kbdcz1.dll kbdcz1.spec)
 
-add_library(kbdcz1 SHARED kbdcz1.c kbdcz1.rc)
+add_library(kbdcz1 SHARED kbdcz1.c kbdcz1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz1.def)
 
 set_entrypoint(kbdcz1 0)
 
-target_link_libraries(kbdcz1 ${CMAKE_CURRENT_BINARY_DIR}/kbdcz1.def)
 
-add_dependencies(kbdcz1 kbdcz1_def psdk buildno_header)
+
+add_dependencies(kbdcz1 psdk buildno_header)
index 6c112d1..36d3a23 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdda ${CMAKE_CURRENT_SOURCE_DIR}/kbdda.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdda.def)
+spec2def(kbdda.dll kbdda.spec)
 
-add_library(kbdda SHARED kbdda.c kbdda.rc)
+add_library(kbdda SHARED kbdda.c kbdda.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdda.def)
 
 set_entrypoint(kbdda 0)
 
-target_link_libraries(kbdda ${CMAKE_CURRENT_BINARY_DIR}/kbdda.def)
 
-add_dependencies(kbdda kbdda_def psdk buildno_header)
+
+add_dependencies(kbdda psdk buildno_header)
index 053153d..78ad4b9 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbddv ${CMAKE_CURRENT_SOURCE_DIR}/kbddv.spec ${CMAKE_CURRENT_BINARY_DIR}/kbddv.def)
+spec2def(kbddv.dll kbddv.spec)
 
-add_library(kbddv SHARED kbddv.c kbddv.rc)
+add_library(kbddv SHARED kbddv.c kbddv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbddv.def)
 
 set_entrypoint(kbddv 0)
 
-target_link_libraries(kbddv ${CMAKE_CURRENT_BINARY_DIR}/kbddv.def)
 
-add_dependencies(kbddv kbddv_def psdk buildno_header)
+
+add_dependencies(kbddv psdk buildno_header)
index 99de328..095ae64 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdes ${CMAKE_CURRENT_SOURCE_DIR}/kbdes.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdes.def)
+spec2def(kbdes.dll kbdes.spec)
 
-add_library(kbdes SHARED kbdes.c kbdes.rc)
+add_library(kbdes SHARED kbdes.c kbdes.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdes.def)
 
 set_entrypoint(kbdes 0)
 
-target_link_libraries(kbdes ${CMAKE_CURRENT_BINARY_DIR}/kbdes.def)
 
-add_dependencies(kbdes kbdes_def psdk buildno_header)
+
+add_dependencies(kbdes psdk buildno_header)
index 30efca0..f202081 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdest ${CMAKE_CURRENT_SOURCE_DIR}/kbdest.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdest.def)
+spec2def(kbdest.dll kbdest.spec)
 
-add_library(kbdest SHARED kbdest.c kbdest.rc)
+add_library(kbdest SHARED kbdest.c kbdest.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdest.def)
 
 set_entrypoint(kbdest 0)
 
-target_link_libraries(kbdest ${CMAKE_CURRENT_BINARY_DIR}/kbdest.def)
 
-add_dependencies(kbdest kbdest_def psdk buildno_header)
+
+add_dependencies(kbdest psdk buildno_header)
index 32276c7..13ba1d7 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdfc ${CMAKE_CURRENT_SOURCE_DIR}/kbdfc.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdfc.def)
+spec2def(kbdfc.dll kbdfc.spec)
 
-add_library(kbdfc SHARED kbdfc.c kbdfc.rc)
+add_library(kbdfc SHARED kbdfc.c kbdfc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfc.def)
 
 set_entrypoint(kbdfc 0)
 
-target_link_libraries(kbdfc ${CMAKE_CURRENT_BINARY_DIR}/kbdfc.def)
 
-add_dependencies(kbdfc kbdfc_def psdk buildno_header)
+
+add_dependencies(kbdfc psdk buildno_header)
index dc9039a..ee44517 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdfi ${CMAKE_CURRENT_SOURCE_DIR}/kbdfi.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdfi.def)
+spec2def(kbdfi.dll kbdfi.spec)
 
-add_library(kbdfi SHARED kbdfi.c kbdfi.rc)
+add_library(kbdfi SHARED kbdfi.c kbdfi.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfi.def)
 
 set_entrypoint(kbdfi 0)
 
-target_link_libraries(kbdfi ${CMAKE_CURRENT_BINARY_DIR}/kbdfi.def)
 
-add_dependencies(kbdfi kbdfi_def psdk buildno_header)
+
+add_dependencies(kbdfi psdk buildno_header)
index 672fca6..2b844a9 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdfr ${CMAKE_CURRENT_SOURCE_DIR}/kbdfr.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def)
+spec2def(kbdfr.dll kbdfr.spec)
 
-add_library(kbdfr SHARED kbdfr.c kbdfr.rc)
+add_library(kbdfr SHARED kbdfr.c kbdfr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def)
 
 set_entrypoint(kbdfr 0)
 
-target_link_libraries(kbdfr ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def)
 
-add_dependencies(kbdfr kbdfr_def psdk buildno_header)
+
+add_dependencies(kbdfr psdk buildno_header)
index 0443df7..b81b147 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdgeo ${CMAKE_CURRENT_SOURCE_DIR}/kbdgeo.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdgeo.def)
+spec2def(kbdgeo.dll kbdgeo.spec)
 
-add_library(kbdgeo SHARED kbdgeo.c kbdgeo.rc)
+add_library(kbdgeo SHARED kbdgeo.c kbdgeo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgeo.def)
 
 set_entrypoint(kbdgeo 0)
 
-target_link_libraries(kbdgeo ${CMAKE_CURRENT_BINARY_DIR}/kbdgeo.def)
 
-add_dependencies(kbdgeo kbdgeo_def psdk buildno_header)
+
+add_dependencies(kbdgeo psdk buildno_header)
index d6df560..f2af220 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdgerg ${CMAKE_CURRENT_SOURCE_DIR}/kbdgerg.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdgerg.def)
+spec2def(kbdgerg.dll kbdgerg.spec)
 
-add_library(kbdgerg SHARED kbdgerg.c kbdgerg.rc)
+add_library(kbdgerg SHARED kbdgerg.c kbdgerg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgerg.def)
 
 set_entrypoint(kbdgerg 0)
 
-target_link_libraries(kbdgerg ${CMAKE_CURRENT_BINARY_DIR}/kbdgerg.def)
 
-add_dependencies(kbdgerg kbdgerg_def psdk buildno_header)
+
+add_dependencies(kbdgerg psdk buildno_header)
index 8984392..884bc5d 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdgneo ${CMAKE_CURRENT_SOURCE_DIR}/kbdgneo.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdgneo.def)
+spec2def(kbdgneo.dll kbdgneo.spec)
 
-add_library(kbdgneo SHARED kbdgneo.c kbdgneo.rc)
+add_library(kbdgneo SHARED kbdgneo.c kbdgneo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgneo.def)
 
 set_entrypoint(kbdgneo 0)
 
-target_link_libraries(kbdgneo ${CMAKE_CURRENT_BINARY_DIR}/kbdgneo.def)
 
-add_dependencies(kbdgneo kbdgneo_def psdk buildno_header)
+
+add_dependencies(kbdgneo psdk buildno_header)
index 545b516..452784d 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdgr ${CMAKE_CURRENT_SOURCE_DIR}/kbdgr.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdgr.def)
+spec2def(kbdgr.dll kbdgr.spec)
 
-add_library(kbdgr SHARED kbdgr.c kbdgr.rc)
+add_library(kbdgr SHARED kbdgr.c kbdgr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgr.def)
 
 set_entrypoint(kbdgr 0)
 
-target_link_libraries(kbdgr ${CMAKE_CURRENT_BINARY_DIR}/kbdgr.def)
 
-add_dependencies(kbdgr kbdgr_def psdk buildno_header)
+
+add_dependencies(kbdgr psdk buildno_header)
index c84e83b..383ab17 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdgrist ${CMAKE_CURRENT_SOURCE_DIR}/kbdgrist.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdgrist.def)
+spec2def(kbdgrist.dll kbdgrist.spec)
 
-add_library(kbdgrist SHARED kbdgrist.c kbdgrist.rc)
+add_library(kbdgrist SHARED kbdgrist.c kbdgrist.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgrist.def)
 
 set_entrypoint(kbdgrist 0)
 
-target_link_libraries(kbdgrist ${CMAKE_CURRENT_BINARY_DIR}/kbdgrist.def)
 
-add_dependencies(kbdgrist kbdgrist_def psdk buildno_header)
+
+add_dependencies(kbdgrist psdk buildno_header)
index db76ae7..1a9b3bf 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdhe ${CMAKE_CURRENT_SOURCE_DIR}/kbdhe.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdhe.def)
+spec2def(kbdhe.dll kbdhe.spec)
 
-add_library(kbdhe SHARED kbdhe.c kbdhe.rc)
+add_library(kbdhe SHARED kbdhe.c kbdhe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhe.def)
 
 set_entrypoint(kbdhe 0)
 
-target_link_libraries(kbdhe ${CMAKE_CURRENT_BINARY_DIR}/kbdhe.def)
 
-add_dependencies(kbdhe kbdhe_def psdk buildno_header)
+
+add_dependencies(kbdhe psdk buildno_header)
index 736da8b..709b49e 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdheb ${CMAKE_CURRENT_SOURCE_DIR}/kbdheb.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdheb.def)
+spec2def(kbdheb.dll kbdheb.spec)
 
-add_library(kbdheb SHARED kbdheb.c kbdheb.rc)
+add_library(kbdheb SHARED kbdheb.c kbdheb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdheb.def)
 
 set_entrypoint(kbdheb 0)
 
-target_link_libraries(kbdheb ${CMAKE_CURRENT_BINARY_DIR}/kbdheb.def)
 
-add_dependencies(kbdheb kbdheb_def psdk buildno_header)
+
+add_dependencies(kbdheb psdk buildno_header)
index 7ecb50d..9351f66 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdhu ${CMAKE_CURRENT_SOURCE_DIR}/kbdhu.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdhu.def)
+spec2def(kbdhu.dll kbdhu.spec)
 
-add_library(kbdhu SHARED kbdhu.c kbdhu.rc)
+add_library(kbdhu SHARED kbdhu.c kbdhu.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhu.def)
 
 set_entrypoint(kbdhu 0)
 
-target_link_libraries(kbdhu ${CMAKE_CURRENT_BINARY_DIR}/kbdhu.def)
 
-add_dependencies(kbdhu kbdhu_def psdk buildno_header)
+
+add_dependencies(kbdhu psdk buildno_header)
index 6831b8b..2d61cca 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdic ${CMAKE_CURRENT_SOURCE_DIR}/kbdic.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdic.def)
+spec2def(kbdic.dll kbdic.spec)
 
-add_library(kbdic SHARED kbdic.c kbdic.rc)
+add_library(kbdic SHARED kbdic.c kbdic.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdic.def)
 
 set_entrypoint(kbdic 0)
 
-target_link_libraries(kbdic ${CMAKE_CURRENT_BINARY_DIR}/kbdic.def)
 
-add_dependencies(kbdic kbdic_def psdk buildno_header)
+
+add_dependencies(kbdic psdk buildno_header)
index ece5689..8ebd052 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdinasa ${CMAKE_CURRENT_SOURCE_DIR}/kbdinasa.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdinasa.def)
+spec2def(kbdinasa.dll kbdinasa.spec)
 
-add_library(kbdinasa SHARED kbdinasa.c kbdinasa.rc)
+add_library(kbdinasa SHARED kbdinasa.c kbdinasa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinasa.def)
 
 set_entrypoint(kbdinasa 0)
 
-target_link_libraries(kbdinasa ${CMAKE_CURRENT_BINARY_DIR}/kbdinasa.def)
 
-add_dependencies(kbdinasa kbdinasa_def psdk buildno_header)
+
+add_dependencies(kbdinasa psdk buildno_header)
index 2bec780..b0db9bd 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdinben ${CMAKE_CURRENT_SOURCE_DIR}/kbdinben.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdinben.def)
+spec2def(kbdinben.dll kbdinben.spec)
 
-add_library(kbdinben SHARED kbdinben.c kbdinben.rc)
+add_library(kbdinben SHARED kbdinben.c kbdinben.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinben.def)
 
 set_entrypoint(kbdinben 0)
 
-target_link_libraries(kbdinben ${CMAKE_CURRENT_BINARY_DIR}/kbdinben.def)
 
-add_dependencies(kbdinben kbdinben_def psdk buildno_header)
+
+add_dependencies(kbdinben psdk buildno_header)
index e511747..d8d4fdd 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdindev ${CMAKE_CURRENT_SOURCE_DIR}/kbdindev.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdindev.def)
+spec2def(kbdindev.dll kbdindev.spec)
 
-add_library(kbdindev SHARED kbdindev.c kbdindev.rc)
+add_library(kbdindev SHARED kbdindev.c kbdindev.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdindev.def)
 
 set_entrypoint(kbdindev 0)
 
-target_link_libraries(kbdindev ${CMAKE_CURRENT_BINARY_DIR}/kbdindev.def)
 
-add_dependencies(kbdindev kbdindev_def psdk buildno_header)
+
+add_dependencies(kbdindev psdk buildno_header)
index 6c40af0..ba58c58 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdinguj ${CMAKE_CURRENT_SOURCE_DIR}/kbdinguj.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdinguj.def)
+spec2def(kbdinguj.dll kbdinguj.spec)
 
-add_library(kbdinguj SHARED kbdinguj.c kbdinguj.rc)
+add_library(kbdinguj SHARED kbdinguj.c kbdinguj.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinguj.def)
 
 set_entrypoint(kbdinguj 0)
 
-target_link_libraries(kbdinguj ${CMAKE_CURRENT_BINARY_DIR}/kbdinguj.def)
 
-add_dependencies(kbdinguj kbdinguj_def psdk buildno_header)
+
+add_dependencies(kbdinguj psdk buildno_header)
index 640138e..d00d4aa 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdinmal ${CMAKE_CURRENT_SOURCE_DIR}/kbdinmal.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdinmal.def)
+spec2def(kbdinmal.dll kbdinmal.spec)
 
-add_library(kbdinmal SHARED kbdinmal.c kbdinmal.rc)
+add_library(kbdinmal SHARED kbdinmal.c kbdinmal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinmal.def)
 
 set_entrypoint(kbdinmal 0)
 
-target_link_libraries(kbdinmal ${CMAKE_CURRENT_BINARY_DIR}/kbdinmal.def)
 
-add_dependencies(kbdinmal kbdinmal_def psdk buildno_header)
+
+add_dependencies(kbdinmal psdk buildno_header)
index 7b7ec96..b4bc355 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdir ${CMAKE_CURRENT_SOURCE_DIR}/kbdir.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdir.def)
+spec2def(kbdir.dll kbdir.spec)
 
-add_library(kbdir SHARED kbdir.c kbdir.rc)
+add_library(kbdir SHARED kbdir.c kbdir.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdir.def)
 
 set_entrypoint(kbdir 0)
 
-target_link_libraries(kbdir ${CMAKE_CURRENT_BINARY_DIR}/kbdir.def)
 
-add_dependencies(kbdir kbdir_def psdk buildno_header)
+
+add_dependencies(kbdir psdk buildno_header)
index ff6d83f..69dab6e 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdit ${CMAKE_CURRENT_SOURCE_DIR}/kbdit.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdit.def)
+spec2def(kbdit.dll kbdit.spec)
 
-add_library(kbdit SHARED kbdit.c kbdit.rc)
+add_library(kbdit SHARED kbdit.c kbdit.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdit.def)
 
 set_entrypoint(kbdit 0)
 
-target_link_libraries(kbdit ${CMAKE_CURRENT_BINARY_DIR}/kbdit.def)
 
-add_dependencies(kbdit kbdit_def psdk buildno_header)
+
+add_dependencies(kbdit psdk buildno_header)
index fa066e7..41533a4 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdja ${CMAKE_CURRENT_SOURCE_DIR}/kbdja.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdja.def)
+spec2def(kbdja.dll kbdja.spec)
 
-add_library(kbdja SHARED kbdja.c kbdja.rc)
+add_library(kbdja SHARED kbdja.c kbdja.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdja.def)
 
 set_entrypoint(kbdja 0)
 
-target_link_libraries(kbdja ${CMAKE_CURRENT_BINARY_DIR}/kbdja.def)
 
-add_dependencies(kbdja kbdja_def psdk buildno_header)
+
+add_dependencies(kbdja psdk buildno_header)
index 06855e7..b5973a7 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdkaz ${CMAKE_CURRENT_SOURCE_DIR}/kbdkaz.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdkaz.def)
+spec2def(kbdkaz.dll kbdkaz.spec)
 
-add_library(kbdkaz SHARED kbdkaz.c kbdkaz.rc)
+add_library(kbdkaz SHARED kbdkaz.c kbdkaz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdkaz.def)
 
 set_entrypoint(kbdkaz 0)
 
-target_link_libraries(kbdkaz ${CMAKE_CURRENT_BINARY_DIR}/kbdkaz.def)
 
-add_dependencies(kbdkaz kbdkaz_def psdk buildno_header)
+
+add_dependencies(kbdkaz psdk buildno_header)
index 2297ab1..474d336 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdko ${CMAKE_CURRENT_SOURCE_DIR}/kbdko.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdko.def)
+spec2def(kbdko.dll kbdko.spec)
 
-add_library(kbdko SHARED kbdko.c kbdko.rc)
+add_library(kbdko SHARED kbdko.c kbdko.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdko.def)
 
 set_entrypoint(kbdko 0)
 
-target_link_libraries(kbdko ${CMAKE_CURRENT_BINARY_DIR}/kbdko.def)
 
-add_dependencies(kbdko kbdko_def psdk buildno_header)
+
+add_dependencies(kbdko psdk buildno_header)
index e29735e..7e7fc55 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdla ${CMAKE_CURRENT_SOURCE_DIR}/kbdla.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdla.def)
+spec2def(kbdla.dll kbdla.spec)
 
-add_library(kbdla SHARED kbdla.c kbdla.rc)
+add_library(kbdla SHARED kbdla.c kbdla.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdla.def)
 
 set_entrypoint(kbdla 0)
 
-target_link_libraries(kbdla ${CMAKE_CURRENT_BINARY_DIR}/kbdla.def)
 
-add_dependencies(kbdla kbdla_def psdk buildno_header)
+
+add_dependencies(kbdla psdk buildno_header)
index b7fcd22..c80096c 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdlt1 ${CMAKE_CURRENT_SOURCE_DIR}/kbdlt1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdlt1.def)
+spec2def(kbdlt1.dll kbdlt1.spec)
 
-add_library(kbdlt1 SHARED kbdlt1.c kbdlt1.rc)
+add_library(kbdlt1 SHARED kbdlt1.c kbdlt1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlt1.def)
 
 set_entrypoint(kbdlt1 0)
 
-target_link_libraries(kbdlt1 ${CMAKE_CURRENT_BINARY_DIR}/kbdlt1.def)
 
-add_dependencies(kbdlt1 kbdlt1_def psdk buildno_header)
+
+add_dependencies(kbdlt1 psdk buildno_header)
index ba376f8..9b0a847 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdlv ${CMAKE_CURRENT_SOURCE_DIR}/kbdlv.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdlv.def)
+spec2def(kbdlv.dll kbdlv.spec)
 
-add_library(kbdlv SHARED kbdlv.c kbdlv.rc)
+add_library(kbdlv SHARED kbdlv.c kbdlv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlv.def)
 
 set_entrypoint(kbdlv 0)
 
-target_link_libraries(kbdlv ${CMAKE_CURRENT_BINARY_DIR}/kbdlv.def)
 
-add_dependencies(kbdlv kbdlv_def psdk buildno_header)
+
+add_dependencies(kbdlv psdk buildno_header)
index aad9322..6cedc3e 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdmac ${CMAKE_CURRENT_SOURCE_DIR}/kbdmac.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdmac.def)
+spec2def(kbdmac.dll kbdmac.spec)
 
-add_library(kbdmac SHARED kbdmac.c kbdmac.rc)
+add_library(kbdmac SHARED kbdmac.c kbdmac.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdmac.def)
 
 set_entrypoint(kbdmac 0)
 
-target_link_libraries(kbdmac ${CMAKE_CURRENT_BINARY_DIR}/kbdmac.def)
 
-add_dependencies(kbdmac kbdmac_def psdk buildno_header)
+
+add_dependencies(kbdmac psdk buildno_header)
index 2f5f4f1..7c90eaf 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdne ${CMAKE_CURRENT_SOURCE_DIR}/kbdne.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdne.def)
+spec2def(kbdne.dll kbdne.spec)
 
-add_library(kbdne SHARED kbdne.c kbdne.rc)
+add_library(kbdne SHARED kbdne.c kbdne.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdne.def)
 
 set_entrypoint(kbdne 0)
 
-target_link_libraries(kbdne ${CMAKE_CURRENT_BINARY_DIR}/kbdne.def)
 
-add_dependencies(kbdne kbdne_def psdk buildno_header)
+
+add_dependencies(kbdne psdk buildno_header)
index ce4f6fd..c1cf5c6 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdno ${CMAKE_CURRENT_SOURCE_DIR}/kbdno.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdno.def)
+spec2def(kbdno.dll kbdno.spec)
 
-add_library(kbdno SHARED kbdno.c kbdno.rc)
+add_library(kbdno SHARED kbdno.c kbdno.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdno.def)
 
 set_entrypoint(kbdno 0)
 
-target_link_libraries(kbdno ${CMAKE_CURRENT_BINARY_DIR}/kbdno.def)
 
-add_dependencies(kbdno kbdno_def psdk buildno_header)
+
+add_dependencies(kbdno psdk buildno_header)
index 11176d9..da6f13c 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdpl1 ${CMAKE_CURRENT_SOURCE_DIR}/kbdpl1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def)
+spec2def(kbdpl1.dll kbdpl1.spec)
 
-add_library(kbdpl1 SHARED kbdpl1.c kbdpl1.rc)
+add_library(kbdpl1 SHARED kbdpl1.c kbdpl1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def)
 
 set_entrypoint(kbdpl1 0)
 
-target_link_libraries(kbdpl1 ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def)
 
-add_dependencies(kbdpl1 kbdpl1_def psdk buildno_header)
+
+add_dependencies(kbdpl1 psdk buildno_header)
index af120a1..1e99a23 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdpo ${CMAKE_CURRENT_SOURCE_DIR}/kbdpo.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdpo.def)
+spec2def(kbdpo.dll kbdpo.spec)
 
-add_library(kbdpo SHARED kbdpo.c kbdpo.rc)
+add_library(kbdpo SHARED kbdpo.c kbdpo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpo.def)
 
 set_entrypoint(kbdpo 0)
 
-target_link_libraries(kbdpo ${CMAKE_CURRENT_BINARY_DIR}/kbdpo.def)
 
-add_dependencies(kbdpo kbdpo_def psdk buildno_header)
+
+add_dependencies(kbdpo psdk buildno_header)
index 4be095c..2c6a910 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdro ${CMAKE_CURRENT_SOURCE_DIR}/kbdro.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdro.def)
+spec2def(kbdro.dll kbdro.spec)
 
-add_library(kbdro SHARED kbdro.c kbdro.rc)
+add_library(kbdro SHARED kbdro.c kbdro.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdro.def)
 
 set_entrypoint(kbdro 0)
 
-target_link_libraries(kbdro ${CMAKE_CURRENT_BINARY_DIR}/kbdro.def)
 
-add_dependencies(kbdro kbdro_def psdk buildno_header)
+
+add_dependencies(kbdro psdk buildno_header)
index 2bd2f8e..4eaecc5 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdru ${CMAKE_CURRENT_SOURCE_DIR}/kbdru.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdru.def)
+spec2def(kbdru.dll kbdru.spec)
 
-add_library(kbdru SHARED kbdru.c kbdru.rc)
+add_library(kbdru SHARED kbdru.c kbdru.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru.def)
 
 set_entrypoint(kbdru 0)
 
-target_link_libraries(kbdru ${CMAKE_CURRENT_BINARY_DIR}/kbdru.def)
 
-add_dependencies(kbdru kbdru_def psdk buildno_header)
+
+add_dependencies(kbdru psdk buildno_header)
index 145dd7b..2cdc79c 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdru1 ${CMAKE_CURRENT_SOURCE_DIR}/kbdru1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdru1.def)
+spec2def(kbdru1.dll kbdru1.spec)
 
-add_library(kbdru1 SHARED kbdru1.c kbdru1.rc)
+add_library(kbdru1 SHARED kbdru1.c kbdru1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru1.def)
 
 set_entrypoint(kbdru1 0)
 
-target_link_libraries(kbdru1 ${CMAKE_CURRENT_BINARY_DIR}/kbdru1.def)
 
-add_dependencies(kbdru1 kbdru1_def psdk buildno_header)
+
+add_dependencies(kbdru1 psdk buildno_header)
index 91f0649..c58cffe 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdsg ${CMAKE_CURRENT_SOURCE_DIR}/kbdsg.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdsg.def)
+spec2def(kbdsg.dll kbdsg.spec)
 
-add_library(kbdsg SHARED kbdsg.c kbdsg.rc)
+add_library(kbdsg SHARED kbdsg.c kbdsg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsg.def)
 
 set_entrypoint(kbdsg 0)
 
-target_link_libraries(kbdsg ${CMAKE_CURRENT_BINARY_DIR}/kbdsg.def)
 
-add_dependencies(kbdsg kbdsg_def psdk buildno_header)
+
+add_dependencies(kbdsg psdk buildno_header)
index 3a36ba3..a3838c0 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdsk ${CMAKE_CURRENT_SOURCE_DIR}/kbdsk.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdsk.def)
+spec2def(kbdsk.dll kbdsk.spec)
 
-add_library(kbdsk SHARED kbdsk.c kbdsk.rc)
+add_library(kbdsk SHARED kbdsk.c kbdsk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk.def)
 
 set_entrypoint(kbdsk 0)
 
-target_link_libraries(kbdsk ${CMAKE_CURRENT_BINARY_DIR}/kbdsk.def)
 
-add_dependencies(kbdsk kbdsk_def psdk buildno_header)
+
+add_dependencies(kbdsk psdk buildno_header)
index 96d0ec5..8398165 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdsk1 ${CMAKE_CURRENT_SOURCE_DIR}/kbdsk1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdsk1.def)
+spec2def(kbdsk1.dll kbdsk1.spec)
 
-add_library(kbdsk1 SHARED kbdsk1.c kbdsk1.rc)
+add_library(kbdsk1 SHARED kbdsk1.c kbdsk1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk1.def)
 
 set_entrypoint(kbdsk1 0)
 
-target_link_libraries(kbdsk1 ${CMAKE_CURRENT_BINARY_DIR}/kbdsk1.def)
 
-add_dependencies(kbdsk1 kbdsk1_def psdk buildno_header)
+
+add_dependencies(kbdsk1 psdk buildno_header)
index 6e51530..f31678d 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdsw ${CMAKE_CURRENT_SOURCE_DIR}/kbdsw.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdsw.def)
+spec2def(kbdsw.dll kbdsw.spec)
 
-add_library(kbdsw SHARED kbdsw.c kbdsw.rc)
+add_library(kbdsw SHARED kbdsw.c kbdsw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsw.def)
 
 set_entrypoint(kbdsw 0)
 
-target_link_libraries(kbdsw ${CMAKE_CURRENT_BINARY_DIR}/kbdsw.def)
 
-add_dependencies(kbdsw kbdsw_def psdk buildno_header)
+
+add_dependencies(kbdsw psdk buildno_header)
index 61a0d30..9753cb7 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdtat ${CMAKE_CURRENT_SOURCE_DIR}/kbdtat.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdtat.def)
+spec2def(kbdtat.dll kbdtat.spec)
 
-add_library(kbdtat SHARED kbdtat.c kbdtat.rc)
+add_library(kbdtat SHARED kbdtat.c kbdtat.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtat.def)
 
 set_entrypoint(kbdtat 0)
 
-target_link_libraries(kbdtat ${CMAKE_CURRENT_BINARY_DIR}/kbdtat.def)
 
-add_dependencies(kbdtat kbdtat_def psdk buildno_header)
+
+add_dependencies(kbdtat psdk buildno_header)
index 236f9c3..ae88672 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdth0 ${CMAKE_CURRENT_SOURCE_DIR}/kbdth0.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdth0.def)
+spec2def(kbdth0.dll kbdth0.spec)
 
-add_library(kbdth0 SHARED kbdth0.c kbdth0.rc)
+add_library(kbdth0 SHARED kbdth0.c kbdth0.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth0.def)
 
 set_entrypoint(kbdth0 0)
 
-target_link_libraries(kbdth0 ${CMAKE_CURRENT_BINARY_DIR}/kbdth0.def)
 
-add_dependencies(kbdth0 kbdth0_def psdk buildno_header)
+
+add_dependencies(kbdth0 psdk buildno_header)
index 01478d8..1057010 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdth1 ${CMAKE_CURRENT_SOURCE_DIR}/kbdth1.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdth1.def)
+spec2def(kbdth1.dll kbdth1.spec)
 
-add_library(kbdth1 SHARED kbdth1.c kbdth1.rc)
+add_library(kbdth1 SHARED kbdth1.c kbdth1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth1.def)
 
 set_entrypoint(kbdth1 0)
 
-target_link_libraries(kbdth1 ${CMAKE_CURRENT_BINARY_DIR}/kbdth1.def)
 
-add_dependencies(kbdth1 kbdth1_def psdk buildno_header)
+
+add_dependencies(kbdth1 psdk buildno_header)
index 8fa50b5..ca21d85 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdth2 ${CMAKE_CURRENT_SOURCE_DIR}/kbdth2.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdth2.def)
+spec2def(kbdth2.dll kbdth2.spec)
 
-add_library(kbdth2 SHARED kbdth2.c kbdth2.rc)
+add_library(kbdth2 SHARED kbdth2.c kbdth2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth2.def)
 
 set_entrypoint(kbdth2 0)
 
-target_link_libraries(kbdth2 ${CMAKE_CURRENT_BINARY_DIR}/kbdth2.def)
 
-add_dependencies(kbdth2 kbdth2_def psdk buildno_header)
+
+add_dependencies(kbdth2 psdk buildno_header)
index b04dd6a..15cc2f0 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdth3 ${CMAKE_CURRENT_SOURCE_DIR}/kbdth3.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdth3.def)
+spec2def(kbdth3.dll kbdth3.spec)
 
-add_library(kbdth3 SHARED kbdth3.c kbdth3.rc)
+add_library(kbdth3 SHARED kbdth3.c kbdth3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth3.def)
 
 set_entrypoint(kbdth3 0)
 
-target_link_libraries(kbdth3 ${CMAKE_CURRENT_BINARY_DIR}/kbdth3.def)
 
-add_dependencies(kbdth3 kbdth3_def psdk buildno_header)
+
+add_dependencies(kbdth3 psdk buildno_header)
index ad18580..36a5436 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdtuf ${CMAKE_CURRENT_SOURCE_DIR}/kbdtuf.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdtuf.def)
+spec2def(kbdtuf.dll kbdtuf.spec)
 
-add_library(kbdtuf SHARED kbdtuf.c kbdtuf.rc)
+add_library(kbdtuf SHARED kbdtuf.c kbdtuf.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuf.def)
 
 set_entrypoint(kbdtuf 0)
 
-target_link_libraries(kbdtuf ${CMAKE_CURRENT_BINARY_DIR}/kbdtuf.def)
 
-add_dependencies(kbdtuf kbdtuf_def psdk buildno_header)
+
+add_dependencies(kbdtuf psdk buildno_header)
index 042ec1d..14a4848 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdtuq ${CMAKE_CURRENT_SOURCE_DIR}/kbdtuq.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdtuq.def)
+spec2def(kbdtuq.dll kbdtuq.spec)
 
-add_library(kbdtuq SHARED kbdtuq.c kbdtuq.rc)
+add_library(kbdtuq SHARED kbdtuq.c kbdtuq.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuq.def)
 
 set_entrypoint(kbdtuq 0)
 
-target_link_libraries(kbdtuq ${CMAKE_CURRENT_BINARY_DIR}/kbdtuq.def)
 
-add_dependencies(kbdtuq kbdtuq_def psdk buildno_header)
+
+add_dependencies(kbdtuq psdk buildno_header)
index d2eed68..f2b3c52 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbduk ${CMAKE_CURRENT_SOURCE_DIR}/kbduk.spec ${CMAKE_CURRENT_BINARY_DIR}/kbduk.def)
+spec2def(kbduk.dll kbduk.spec)
 
-add_library(kbduk SHARED kbduk.c kbduk.rc)
+add_library(kbduk SHARED kbduk.c kbduk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduk.def)
 
 set_entrypoint(kbduk 0)
 
-target_link_libraries(kbduk ${CMAKE_CURRENT_BINARY_DIR}/kbduk.def)
 
-add_dependencies(kbduk kbduk_def psdk buildno_header)
+
+add_dependencies(kbduk psdk buildno_header)
index f7262b4..459403b 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdur ${CMAKE_CURRENT_SOURCE_DIR}/kbdur.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdur.def)
+spec2def(kbdur.dll kbdur.spec)
 
-add_library(kbdur SHARED kbdur.c kbdur.rc)
+add_library(kbdur SHARED kbdur.c kbdur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdur.def)
 
 set_entrypoint(kbdur 0)
 
-target_link_libraries(kbdur ${CMAKE_CURRENT_BINARY_DIR}/kbdur.def)
 
-add_dependencies(kbdur kbdur_def psdk buildno_header)
+
+add_dependencies(kbdur psdk buildno_header)
index 984b4d0..8f6d41a 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdurs ${CMAKE_CURRENT_SOURCE_DIR}/kbdurs.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdurs.def)
+spec2def(kbdurs.dll kbdurs.spec)
 
-add_library(kbdurs SHARED kbdurs.c kbdurs.rc)
+add_library(kbdurs SHARED kbdurs.c kbdurs.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdurs.def)
 
 set_entrypoint(kbdurs 0)
 
-target_link_libraries(kbdurs ${CMAKE_CURRENT_BINARY_DIR}/kbdurs.def)
 
-add_dependencies(kbdurs kbdurs_def psdk buildno_header)
+
+add_dependencies(kbdurs psdk buildno_header)
index 624b2b9..21a64e3 100644 (file)
@@ -1,12 +1,12 @@
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdus ${CMAKE_CURRENT_SOURCE_DIR}/kbdus.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
+spec2def(kbdus.dll kbdus.spec)
 
-add_library(kbdus SHARED kbdus.c kbdus.rc)
+add_library(kbdus SHARED kbdus.c kbdus.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
 
 set_entrypoint(kbdus 0)
 
-target_link_libraries(kbdus ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
 
-add_dependencies(kbdus kbdus_def psdk buildno_header)
+
+add_dependencies(kbdus psdk buildno_header)
 add_cab_target(kbdus 1)
\ No newline at end of file
index 2e3c4fd..b0fcc12 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdusa ${CMAKE_CURRENT_SOURCE_DIR}/kbdusa.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdusa.def)
+spec2def(kbdusa.dll kbdusa.spec)
 
-add_library(kbdusa SHARED kbdusa.c kbdusa.rc)
+add_library(kbdusa SHARED kbdusa.c kbdusa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusa.def)
 
 set_entrypoint(kbdusa 0)
 
-target_link_libraries(kbdusa ${CMAKE_CURRENT_BINARY_DIR}/kbdusa.def)
 
-add_dependencies(kbdusa kbdusa_def psdk buildno_header)
+
+add_dependencies(kbdusa psdk buildno_header)
index 55265f2..dd3cccc 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdusl ${CMAKE_CURRENT_SOURCE_DIR}/kbdusl.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdusl.def)
+spec2def(kbdusl.dll kbdusl.spec)
 
-add_library(kbdusl SHARED kbdusl.c kbdusl.rc)
+add_library(kbdusl SHARED kbdusl.c kbdusl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusl.def)
 
 set_entrypoint(kbdusl 0)
 
-target_link_libraries(kbdusl ${CMAKE_CURRENT_BINARY_DIR}/kbdusl.def)
 
-add_dependencies(kbdusl kbdusl_def psdk buildno_header)
+
+add_dependencies(kbdusl psdk buildno_header)
index 112b0cd..09c35c6 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdusr ${CMAKE_CURRENT_SOURCE_DIR}/kbdusr.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdusr.def)
+spec2def(kbdusr.dll kbdusr.spec)
 
-add_library(kbdusr SHARED kbdusr.c kbdusr.rc)
+add_library(kbdusr SHARED kbdusr.c kbdusr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusr.def)
 
 set_entrypoint(kbdusr 0)
 
-target_link_libraries(kbdusr ${CMAKE_CURRENT_BINARY_DIR}/kbdusr.def)
 
-add_dependencies(kbdusr kbdusr_def psdk buildno_header)
+
+add_dependencies(kbdusr psdk buildno_header)
index 1c11294..3799010 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdusx ${CMAKE_CURRENT_SOURCE_DIR}/kbdusx.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdusx.def)
+spec2def(kbdusx.dll kbdusx.spec)
 
-add_library(kbdusx SHARED kbdusx.c kbdusx.rc)
+add_library(kbdusx SHARED kbdusx.c kbdusx.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusx.def)
 
 set_entrypoint(kbdusx 0)
 
-target_link_libraries(kbdusx ${CMAKE_CURRENT_BINARY_DIR}/kbdusx.def)
 
-add_dependencies(kbdusx kbdusx_def psdk buildno_header)
+
+add_dependencies(kbdusx psdk buildno_header)
index 684b4e1..594bcc0 100644 (file)
@@ -1,12 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbduzb ${CMAKE_CURRENT_SOURCE_DIR}/kbduzb.spec ${CMAKE_CURRENT_BINARY_DIR}/kbduzb.def)
+spec2def(kbduzb.dll kbduzb.spec)
 
-add_library(kbduzb SHARED kbduzb.c kbduzb.rc)
+add_library(kbduzb SHARED kbduzb.c kbduzb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduzb.def)
 
 set_entrypoint(kbduzb 0)
 
-target_link_libraries(kbduzb ${CMAKE_CURRENT_BINARY_DIR}/kbduzb.def)
 
-add_dependencies(kbduzb kbduzb_def psdk buildno_header)
+
+add_dependencies(kbduzb psdk buildno_header)
index d264679..cca613c 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdvntc ${CMAKE_CURRENT_SOURCE_DIR}/kbdvntc.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdvntc.def)
+spec2def(kbdvntc.dll kbdvntc.spec)
 
-add_library(kbdvntc SHARED kbdvntc.c kbdvntc.rc)
+add_library(kbdvntc SHARED kbdvntc.c kbdvntc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdvntc.def)
 
 set_entrypoint(kbdvntc 0)
 
-target_link_libraries(kbdvntc ${CMAKE_CURRENT_BINARY_DIR}/kbdvntc.def)
-
-add_dependencies(kbdvntc kbdvntc_def psdk buildno_header)
+add_dependencies(kbdvntc psdk buildno_header)
index 4236997..b887c9a 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdycc ${CMAKE_CURRENT_SOURCE_DIR}/kbdycc.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdycc.def)
+spec2def(kbdycc.dll kbdycc.spec)
 
-add_library(kbdycc SHARED kbdycc.c kbdycc.rc)
+add_library(kbdycc SHARED kbdycc.c kbdycc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycc.def)
 
 set_entrypoint(kbdycc 0)
 
-target_link_libraries(kbdycc ${CMAKE_CURRENT_BINARY_DIR}/kbdycc.def)
-
-add_dependencies(kbdycc kbdycc_def psdk buildno_header)
+add_dependencies(kbdycc psdk buildno_header)
index e32f1d9..b603474 100644 (file)
@@ -1,12 +1,10 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-spec2def(kbdycl ${CMAKE_CURRENT_SOURCE_DIR}/kbdycl.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdycl.def)
+spec2def(kbdycl.dll kbdycl.spec)
 
-add_library(kbdycl SHARED kbdycl.c kbdycl.rc)
+add_library(kbdycl SHARED kbdycl.c kbdycl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycl.def)
 
 set_entrypoint(kbdycl 0)
 
-target_link_libraries(kbdycl ${CMAKE_CURRENT_BINARY_DIR}/kbdycl.def)
-
-add_dependencies(kbdycl kbdycl_def psdk buildno_header)
+add_dependencies(kbdycl psdk buildno_header)
index 0bfd91b..6bda839 100644 (file)
@@ -2,20 +2,20 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-spec2def(idndl ${CMAKE_CURRENT_SOURCE_DIR}/idndl.spec ${CMAKE_CURRENT_BINARY_DIR}/idndl.def)
+spec2def(idndl.dll idndl.spec)
 
-add_library(idndl SHARED idndl.cpp)
+add_library(idndl SHARED
+    idndl.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/idndl.def)
 
 set_entrypoint(idndl 0)
 
-target_link_libraries(idndl ${CMAKE_CURRENT_BINARY_DIR}/idndl.def)
-
 if(NOT MSVC)
     set_target_properties(idndl PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
 endif(NOT MSVC)
 
 add_importlibs(idndl kernel32)
 
-add_dependencies(idndl idndl_def psdk buildno_header)
+add_dependencies(idndl psdk buildno_header)
 
 add_livecd_target(idndl reactos)
index d8c3300..6b4b4bf 100644 (file)
@@ -1,18 +1,19 @@
 
 set_unicode()
 
-spec2def(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/deskadp.spec ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def)
+spec2def(deskadp.dll deskadp.spec)
 
 list(APPEND SOURCE
     deskadp.c
     shxiface.c
-    deskadp.rc)
+    deskadp.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def)
 
 add_library(deskadp SHARED ${CMAKE_CURRENT_BINARY_DIR}/deskadp_precomp.h.gch ${SOURCE})
 
 set_module_type(deskadp win32dll)
 
-target_link_libraries(deskadp ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def uuid)
+target_link_libraries(deskadp uuid)
 
 add_importlibs(deskadp
     user32
@@ -23,5 +24,5 @@ add_importlibs(deskadp
     ntdll)
 
 add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(deskadp deskadp_def)
+
 add_cab_target(deskadp 1)
index a78832a..31acba5 100644 (file)
@@ -1,18 +1,19 @@
 
 set_unicode()
 
-spec2def(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/deskmon.spec ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def)
+spec2def(deskmon.dll deskmon.spec)
 
 list(APPEND SOURCE
     deskmon.c
     shxiface.c
-    deskmon.rc)
+    deskmon.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def)
 
 add_library(deskmon SHARED ${CMAKE_CURRENT_BINARY_DIR}/deskmon_precomp.h.gch ${SOURCE})
 
 set_module_type(deskmon win32dll)
 
-target_link_libraries(deskmon ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def uuid)
+target_link_libraries(deskmon uuid)
 
 add_importlibs(deskmon
     user32
@@ -23,5 +24,5 @@ add_importlibs(deskmon
     ntdll)
 
 add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(deskmon deskmon_def)
+
 add_cab_target(deskmon 1)
index 7a5e61a..4eaaea5 100644 (file)
@@ -1,14 +1,12 @@
 
 set_unicode()
 
-spec2def(devcpux ${CMAKE_CURRENT_SOURCE_DIR}/devcpux.spec ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
+spec2def(devcpux.dll devcpux.spec)
 
-add_library(devcpux SHARED processor.c processor.rc)
+add_library(devcpux SHARED processor.c processor.rc ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
 
 set_module_type(devcpux win32dll)
 
-target_link_libraries(devcpux ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
-
 add_importlibs(devcpux
     user32
     powrprof
@@ -16,5 +14,4 @@ add_importlibs(devcpux
     kernel32
     ntdll)
 
-add_dependencies(devcpux devcpux_def)
 add_cab_target(devcpux 1)
index 9dff1da..0b61fe8 100644 (file)
@@ -1,16 +1,17 @@
 
 set_unicode()
 
-spec2def(fontext ${CMAKE_CURRENT_SOURCE_DIR}/fontext.spec ${CMAKE_CURRENT_BINARY_DIR}/fontext.def)
+spec2def(fontext.dll fontext.spec)
 
 add_library(fontext SHARED
     fontext.c
     regsvr.c
-    fontext.rc)
+    fontext.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/fontext.def)
 
 set_module_type(fontext win32dll)
 
-target_link_libraries(fontext ${CMAKE_CURRENT_BINARY_DIR}/fontext.def uuid)
+target_link_libraries(fontext uuid)
 
 add_importlibs(fontext
     user32
@@ -23,5 +24,4 @@ add_importlibs(fontext
     kernel32
     ntdll)
 
-add_dependencies(fontext fontext_def)
 add_cab_target(fontext 1)
index ccd3717..b0fb986 100644 (file)
@@ -1,15 +1,18 @@
 
 set_unicode()
 
-spec2def(slayer ${CMAKE_CURRENT_SOURCE_DIR}/slayer.spec ${CMAKE_CURRENT_BINARY_DIR}/slayer.def)
+spec2def(slayer.dll slayer.spec)
 
-list(APPEND SOURCE slayer.c slayer.rc)
+list(APPEND SOURCE
+    slayer.c
+    slayer.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/slayer.def)
 
 add_library(slayer SHARED ${CMAKE_CURRENT_BINARY_DIR}/slayer_precomp.h.gch ${SOURCE})
 
 set_module_type(slayer win32dll)
 
-target_link_libraries(slayer ${CMAKE_CURRENT_BINARY_DIR}/slayer.def uuid)
+target_link_libraries(slayer uuid)
 
 add_importlibs(slayer
     user32
@@ -21,5 +24,5 @@ add_importlibs(slayer
     ntdll)
 
 add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(slayer slayer_def)
+
 add_cab_target(slayer 1)
index 8b4b42b..e6326dd 100644 (file)
@@ -6,14 +6,12 @@ list(APPEND SOURCE
     stubs.c
     acledit.rc)
 
-spec2def(acledit ${CMAKE_CURRENT_SOURCE_DIR}/acledit.spec ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
+spec2def(acledit.dll acledit.spec)
 
-add_library(acledit SHARED ${SOURCE})
+add_library(acledit SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
 set_module_type(acledit win32dll)
 
-target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 add_importlibs(acledit ntdll)
 
-add_dependencies(acledit acledit_def)
 add_cab_target(acledit 1)
index 26309ee..0d370f9 100644 (file)
@@ -9,9 +9,10 @@ list(APPEND SOURCE
     guid.c
     misc.c
     sidcache.c
-    aclui.rc)
+    aclui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
 
-spec2def(aclui ${CMAKE_CURRENT_SOURCE_DIR}/aclui.spec ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
+spec2def(aclui.dll aclui.spec)
 
 add_library(aclui SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch
@@ -19,9 +20,9 @@ add_library(aclui SHARED
 
 set_module_type(aclui win32dll)
 
-target_link_libraries(aclui ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
+
 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll)
 
 add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(aclui aclui_def)
+
 add_cab_target(aclui 1)
index a63561f..24c9b9a 100644 (file)
@@ -3,17 +3,15 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(activeds ${CMAKE_CURRENT_SOURCE_DIR}/activeds.spec ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
+spec2def(activeds.dll activeds.spec)
 
-add_library(activeds SHARED activeds_main.c)
+add_library(activeds SHARED activeds_main.c ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
 
 set_module_type(activeds win32dll)
 
-target_link_libraries(activeds 
-     ${CMAKE_CURRENT_BINARY_DIR}/activeds.def
-     wine)
+target_link_libraries(activeds wine)
 
 add_importlibs(activeds kernel32 ntdll)
 
-add_dependencies(activeds activeds_def)
+
 add_cab_target(activeds 1)
index d7018e2..d37a4d9 100644 (file)
@@ -3,14 +3,13 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(actxprxy ${CMAKE_CURRENT_SOURCE_DIR}/actxprxy.spec ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
+spec2def(actxprxy.dll actxprxy.spec)
 
-add_library(actxprxy SHARED usrmarshal.c)
+add_library(actxprxy SHARED usrmarshal.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
 
 set_entrypoint(actxprxy 0)
 
 target_link_libraries(actxprxy
-    ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def
     actxprxy_proxy
     uuid
     wine
@@ -23,8 +22,6 @@ add_importlibs(actxprxy
     kernel32
     ntdll)
 
-add_dependencies(actxprxy actxprxy_def)
-
 add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION)
 
 rpcproxy(actxprxy
index 1e56bac..6c9eaa4 100644 (file)
@@ -7,18 +7,17 @@ list(APPEND SOURCE
     advpack.c
     files.c
     install.c
-    reg.c)
+    reg.c
+    ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
 
-spec2def(advpack ${CMAKE_CURRENT_SOURCE_DIR}/advpack.spec ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
+spec2def(advpack.dll advpack.spec)
 
 add_library(advpack SHARED ${SOURCE})
 
 set_module_type(advpack win32dll)
 
-target_link_libraries(advpack
-    ${CMAKE_CURRENT_BINARY_DIR}/advpack.def
-    wine)
+target_link_libraries(advpack wine)
 
 add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll)
-add_dependencies(advpack advpack_def)
+
 add_cab_target(advpack 1)
index c684803..172e115 100644 (file)
@@ -8,18 +8,18 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(atl ${CMAKE_CURRENT_SOURCE_DIR}/atl.spec ${CMAKE_CURRENT_BINARY_DIR}/atl.def)
+spec2def(atl.dll atl.spec)
 
 add_library(atl SHARED
     atl_ax.c
     atl_main.c
     registrar.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/atl.def)
 
 set_module_type(atl win32dll)
 
 target_link_libraries(atl
-    ${CMAKE_CURRENT_BINARY_DIR}/atl.def
     uuid
     wine)
 
@@ -33,5 +33,5 @@ add_importlibs(atl
     kernel32
     ntdll)
 
-add_dependencies(atl atl_atliface_header atl_def)
+add_dependencies(atl atl_atliface_header)
 add_cab_target(atl 1)
index d1530a8..18ecd0d 100644 (file)
@@ -5,9 +5,10 @@ list(APPEND SOURCE
     authz.c
     clictx.c
     resman.c
-    authz.rc)
+    authz.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
 
-spec2def(authz ${CMAKE_CURRENT_SOURCE_DIR}/authz.spec ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
+spec2def(authz.dll authz.spec)
 
 add_library(authz SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch
@@ -15,9 +16,9 @@ add_library(authz SHARED
 
 set_module_type(authz win32dll)
 
-target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
+
 
 add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_importlibs(authz advapi32 kernel32 ntdll)
-add_dependencies(authz authz_def)
+
 add_cab_target(authz 1)
index 47e4fee..d5bffa8 100644 (file)
@@ -1,16 +1,14 @@
 
 set_unicode()
 
-spec2def(avicap32 ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.spec ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
+spec2def(avicap32.dll avicap32.spec)
 
-add_library(avicap32 SHARED avicap32.c avicap32.rc)
+add_library(avicap32 SHARED avicap32.c avicap32.rc ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
 
 set_module_type(avicap32 win32dll)
 
-target_link_libraries(avicap32
-    ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def
-    wine)
+target_link_libraries(avicap32 wine)
 
 add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll)
-add_dependencies(avicap32 avicap32_def)
+
 add_cab_target(avicap32 1)
index 1bb273a..a58b814 100644 (file)
@@ -5,7 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(avifil32 ${CMAKE_CURRENT_SOURCE_DIR}/avifil32.spec ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)
+spec2def(avifil32.dll avifil32.spec)
 
 add_library(avifil32 SHARED
     acmstream.c
@@ -19,12 +19,12 @@ add_library(avifil32 SHARED
     regsvr.c
     tmpfile.c
     wavfile.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)
 
 set_module_type(avifil32 win32dll)
 
 target_link_libraries(avifil32
-    ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def
     uuid
     wine)
 
@@ -39,5 +39,5 @@ add_importlibs(avifil32
     kernel32
     ntdll)
 
-add_dependencies(avifil32 avifil32_def)
+
 add_cab_target(avifil32 1)
index 417820c..fc51547 100644 (file)
@@ -1,14 +1,12 @@
 
 set_unicode()
 
-spec2def(batt ${CMAKE_CURRENT_SOURCE_DIR}/batt.spec ${CMAKE_CURRENT_BINARY_DIR}/batt.def)
+spec2def(batt.dll batt.spec)
 
-add_library(batt SHARED batt.c batt.rc)
+add_library(batt SHARED batt.c batt.rc ${CMAKE_CURRENT_BINARY_DIR}/batt.def)
 
 set_module_type(batt win32dll)
 
-target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def)
-
 add_importlibs(batt kernel32)
-add_dependencies(batt batt_def)
+
 add_cab_target(batt 1)
index 17e157b..43666ff 100644 (file)
@@ -2,19 +2,18 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(bcrypt ${CMAKE_CURRENT_SOURCE_DIR}/bcrypt.spec ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def)
+spec2def(bcrypt.dll bcrypt.spec)
 
 add_library(bcrypt SHARED
     bcrypt_main.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def)
 
 set_module_type(bcrypt win32dll)
 
-target_link_libraries(bcrypt
-    ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def
-    wine)
+target_link_libraries(bcrypt wine)
 
 add_importlibs(bcrypt kernel32 ntdll)
 
-add_dependencies(bcrypt bcrypt_def)
+
 add_cab_target(bcrypt 1)
index 12313d2..f4f87d8 100644 (file)
@@ -1,14 +1,12 @@
 
 set_unicode()
 
-spec2def(beepmidi ${CMAKE_CURRENT_SOURCE_DIR}/beepmidi.spec ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
+spec2def(beepmidi.dll beepmidi.spec)
 
-add_library(beepmidi SHARED beepmidi.c)
+add_library(beepmidi SHARED beepmidi.c ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
 
 set_entrypoint(beepmidi 0)
 
-target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
-
 add_importlibs(beepmidi winmm kernel32 ntdll)
-add_dependencies(beepmidi beepmidi_def psdk)
+add_dependencies(beepmidi psdk)
 add_cab_target(beepmidi 1)
\ No newline at end of file
index 0ed2597..9281b0c 100644 (file)
@@ -7,7 +7,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
 
-spec2def(browseui ${CMAKE_CURRENT_SOURCE_DIR}/browseui.spec ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
+spec2def(browseui.dll browseui.spec)
 
 add_library(browseui SHARED
     aclmulti.cpp
@@ -29,12 +29,12 @@ add_library(browseui SHARED
     toolsband.cpp
     travellog.cpp
     utility.cpp
-    browseui.rc)
+    browseui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
 
 set_module_type(browseui win32dll)
 
 target_link_libraries(browseui
-    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def
     atlnew
     uuid
     wine)
@@ -51,5 +51,4 @@ add_importlibs(browseui
     advapi32
     ntdll)
 
-add_dependencies(browseui browseui_def)
 add_cab_target(browseui 1)
index 205c6ba..58d05f9 100644 (file)
@@ -3,22 +3,21 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(cabinet ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.spec ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def)
+spec2def(cabinet.dll cabinet.spec)
 
 list(APPEND SOURCE
     cabinet_main.c
     fci.c
     fdi.c
-    cabinet.rc)
+    cabinet.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def)
 
 add_library(cabinet SHARED ${SOURCE})
 
 set_entrypoint(cabinet 0)
 
-target_link_libraries(cabinet
-    ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def
-    wine)
+target_link_libraries(cabinet wine)
 
 add_importlibs(cabinet kernel32 ntdll)
-add_dependencies(cabinet cabinet_def psdk buildno_header)
+add_dependencies(cabinet psdk buildno_header)
 add_cab_target(cabinet 1)
\ No newline at end of file
index f56cc59..e4d5868 100644 (file)
@@ -4,14 +4,12 @@ set_unicode()
 # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN
 add_definitions(-DCARDSTYLE_DEFAULT)
 
-spec2def(cards ${CMAKE_CURRENT_SOURCE_DIR}/cards.spec ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
+spec2def(cards.dll cards.spec)
 
-add_library(cards SHARED cards.c cards.rc)
+add_library(cards SHARED cards.c cards.rc ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
 
 set_module_type(cards win32dll)
 
-target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
-
 add_importlibs(cards user32 gdi32)
-add_dependencies(cards cards_def)
+
 add_cab_target(cards 1)
index 64af9c0..df7a927 100644 (file)
@@ -1,11 +1,9 @@
 
-spec2def(cfgmgr32 ${CMAKE_CURRENT_SOURCE_DIR}/cfgmgr32.spec ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
+spec2def(cfgmgr32.dll cfgmgr32.spec)
 
-add_library(cfgmgr32 SHARED cfgmgr32.rc)
+add_library(cfgmgr32 SHARED cfgmgr32.rc ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
 
 set_entrypoint(cfgmgr32 0)
 
-target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
-
-add_dependencies(cfgmgr32 cfgmgr32_def psdk buildno_header)
+add_dependencies(cfgmgr32 psdk buildno_header)
 add_cab_target(cfgmgr32 1)
index 48560c3..e0535da 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(clusapi ${CMAKE_CURRENT_SOURCE_DIR}/clusapi.spec ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def)
+spec2def(clusapi.dll clusapi.spec)
 
-add_library(clusapi SHARED clusapi.c)
+add_library(clusapi SHARED clusapi.c ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def)
 
 set_module_type(clusapi win32dll)
 
-target_link_libraries(clusapi
-    ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def
-    wine)
+target_link_libraries(clusapi wine)
 
 add_importlibs(clusapi kernel32 ntdll)
-add_dependencies(clusapi clusapi_def)
+
 add_cab_target(clusapi 1)
index 8ca91a0..5f5f16e 100644 (file)
@@ -4,14 +4,13 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(comcat ${CMAKE_CURRENT_SOURCE_DIR}/comcat.spec ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
+spec2def(comcat.dll comcat.spec)
 
-add_library(comcat SHARED comcat_main.c version.rc)
+add_library(comcat SHARED comcat_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
 
 set_entrypoint(comcat 0)
 
 target_link_libraries(comcat
-    ${CMAKE_CURRENT_BINARY_DIR}/comcat.def
     uuid
     wine)
 
@@ -21,5 +20,5 @@ add_importlibs(comcat
     advapi32
     ntdll)
 
-add_dependencies(comcat comcat_def psdk buildno_header)
+add_dependencies(comcat psdk buildno_header)
 add_cab_target(comcat 1)
index 19a998b..2f64e85 100644 (file)
@@ -8,7 +8,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(comctl32 ${CMAKE_CURRENT_SOURCE_DIR}/comctl32.spec ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def)
+spec2def(comctl32.dll comctl32.spec)
 
 add_library(comctl32 SHARED
     animate.c
@@ -47,12 +47,12 @@ add_library(comctl32 SHARED
     trackbar.c
     treeview.c
     updown.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def)
 
 set_module_type(comctl32 win32dll)
 
 target_link_libraries(comctl32
-    ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def
     uuid
     wine)
 
@@ -66,5 +66,4 @@ add_importlibs(comctl32
     kernel32
     ntdll)
 
-add_dependencies(comctl32 comctl32_def)
 add_cab_target(comctl32 1)
index 7e540db..62b823e 100644 (file)
@@ -4,7 +4,7 @@ add_definitions(-D_WINE)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(comdlg32 ${CMAKE_CURRENT_SOURCE_DIR}/comdlg32.spec ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
+spec2def(comdlg32.dll comdlg32.spec)
 
 add_library(comdlg32 SHARED
     cdlg32.c
@@ -15,12 +15,12 @@ add_library(comdlg32 SHARED
     finddlg.c
     fontdlg.c
     printdlg.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
 
 set_module_type(comdlg32 win32dll)
 
 target_link_libraries(comdlg32
-    ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def
     uuid
     wine)
 
@@ -37,5 +37,5 @@ add_importlibs(comdlg32
     kernel32
     ntdll)
 
-add_dependencies(comdlg32 comdlg32_def)
+
 add_cab_target(comdlg32 1)
index 3053b3e..064bdfe 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(compstui ${CMAKE_CURRENT_SOURCE_DIR}/compstui.spec ${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
+spec2def(compstui.dll compstui.spec)
 
-add_library(compstui SHARED compstui_main.c)
+add_library(compstui SHARED compstui_main.c ${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
 
 set_module_type(compstui win32dll)
 
-target_link_libraries(compstui
-    ${CMAKE_CURRENT_BINARY_DIR}/compstui.def
-    wine)
+target_link_libraries(compstui wine)
 
 add_importlibs(compstui kernel32 ntdll)
-add_dependencies(compstui compstui_def)
+
 add_cab_target(compstui 1)
index 21064df..57a5b5b 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(credui ${CMAKE_CURRENT_SOURCE_DIR}/credui.spec ${CMAKE_CURRENT_BINARY_DIR}/credui.def)
+spec2def(credui.dll credui.spec)
 
-add_library(credui SHARED credui_main.c credui.rc)
+add_library(credui SHARED credui_main.c credui.rc ${CMAKE_CURRENT_BINARY_DIR}/credui.def)
 
 set_module_type(credui win32dll)
 
-target_link_libraries(credui
-    ${CMAKE_CURRENT_BINARY_DIR}/credui.def
-    wine)
+target_link_libraries(credui wine)
 
 add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll)
-add_dependencies(credui credui_def)
+
 add_cab_target(credui 1)
index 6c5688e..140f962 100644 (file)
@@ -10,9 +10,12 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
 
-spec2def(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/crtdll.spec ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def)
+spec2def(crtdll.dll crtdll.spec)
 
-list(APPEND SOURCE dllmain.c crtdll.rc)
+list(APPEND SOURCE
+    dllmain.c
+    crtdll.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def)
 
 add_library(crtdll SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/crtdll_precomp.h.gch
@@ -21,11 +24,10 @@ add_library(crtdll SHARED
 set_module_type(crtdll win32dll)
 
 target_link_libraries(crtdll
-    ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def
     wine
     crt)
 
 add_importlibs(crtdll kernel32 ntdll)
 add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(crtdll crtdll_def)
+
 add_cab_target(crtdll 1)
index 10be792..09aab3c 100644 (file)
@@ -10,7 +10,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(crypt32 ${CMAKE_CURRENT_SOURCE_DIR}/crypt32.spec ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
+spec2def(crypt32.dll crypt32.spec)
 
 add_library(crypt32 SHARED
     base64.c
@@ -38,16 +38,16 @@ add_library(crypt32 SHARED
     store.c
     str.c
     crypt32.rc
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
 
 set_module_type(crypt32 win32dll)
 
 target_link_libraries(crypt32
-    ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def
     wine
     pseh
     oldnames)
 
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
-add_dependencies(crypt32 crypt32_def)
+
 add_cab_target(crypt32 1)
index 2bd985a..8193f33 100644 (file)
@@ -2,15 +2,13 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(cryptdlg ${CMAKE_CURRENT_SOURCE_DIR}/cryptdlg.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
+spec2def(cryptdlg.dll cryptdlg.spec)
 
-add_library(cryptdlg SHARED main.c cryptdlg.rc)
+add_library(cryptdlg SHARED main.c cryptdlg.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
 
 set_module_type(cryptdlg win32dll)
 
-target_link_libraries(cryptdlg
-    ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def
-    wine)
+target_link_libraries(cryptdlg wine)
 
 add_importlibs(cryptdlg
     advapi32
@@ -21,5 +19,5 @@ add_importlibs(cryptdlg
     kernel32
     ntdll)
 
-add_dependencies(cryptdlg cryptdlg_def)
+
 add_cab_target(cryptdlg 1)
index 357e420..4c2ad42 100644 (file)
@@ -3,9 +3,9 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(cryptdll ${CMAKE_CURRENT_SOURCE_DIR}/cryptdll.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
+spec2def(cryptdll.dll cryptdll.spec)
 
-add_library(cryptdll SHARED cryptdll.c)
+add_library(cryptdll SHARED cryptdll.c ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
 
 set_module_type(cryptdll win32dll)
 
@@ -14,5 +14,5 @@ target_link_libraries(cryptdll
     wine)
 
 add_importlibs(cryptdll kernel32 ntdll)
-add_dependencies(cryptdll cryptdll_def)
+
 add_cab_target(cryptdll 1)
index 8a99887..db8fe33 100644 (file)
@@ -2,15 +2,13 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(cryptnet ${CMAKE_CURRENT_SOURCE_DIR}/cryptnet.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def)
+spec2def(cryptnet.dll cryptnet.spec)
 
-add_library(cryptnet SHARED cryptnet_main.c)
+add_library(cryptnet SHARED cryptnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def)
 
 set_module_type(cryptnet win32dll)
 
-target_link_libraries(cryptnet
-    ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def
-    wine)
+target_link_libraries(cryptnet wine)
 
 add_importlibs(cryptnet
     crypt32
@@ -18,5 +16,5 @@ add_importlibs(cryptnet
     kernel32
     ntdll)
 
-add_dependencies(cryptnet cryptnet_def)
+
 add_cab_target(cryptnet 1)
index bfcb994..5f644d0 100644 (file)
@@ -3,14 +3,13 @@ add_definitions(-D__WINESRC__)
 add_definitions(-D_WINE)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(cryptui ${CMAKE_CURRENT_SOURCE_DIR}/cryptui.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
+spec2def(cryptui.dll cryptui.spec)
 
-add_library(cryptui SHARED main.c cryptui.rc)
+add_library(cryptui SHARED main.c cryptui.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
 
 set_module_type(cryptui win32dll)
 
 target_link_libraries(cryptui
-    ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def
     uuid
     wine)
 
@@ -27,5 +26,5 @@ add_importlibs(cryptui
     kernel32
     ntdll)
 
-add_dependencies(cryptui cryptui_def)
+
 add_cab_target(cryptui 1)
index 099da6a..bea240c 100644 (file)
@@ -13,7 +13,7 @@ endif(ARCH MATCHES amd64)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dbghelp ${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.spec ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def)
+spec2def(dbghelp.dll dbghelp.spec)
 
 add_library(dbghelp SHARED
     coff.c
@@ -39,16 +39,16 @@ add_library(dbghelp SHARED
     storage.c
     symbol.c
     type.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def)
 
 set_module_type(dbghelp win32dll)
 
 target_link_libraries(dbghelp
-    ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def
     wine
     pseh
     oldnames)
 
 add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
-add_dependencies(dbghelp dbghelp_def)
+
 add_cab_target(dbghelp 1)
index fb294b1..d3aeb9e 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dciman32 ${CMAKE_CURRENT_SOURCE_DIR}/dciman32.spec ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def)
+spec2def(dciman32.dll dciman32.spec)
 
-add_library(dciman32 SHARED dciman_main.c)
+add_library(dciman32 SHARED dciman_main.c ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def)
 
 set_module_type(dciman32 win32dll)
 
-target_link_libraries(dciman32
-    ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def
-    wine)
+target_link_libraries(dciman32 wine)
 
 add_importlibs(dciman32 kernel32 ntdll)
-add_dependencies(dciman32 dciman32_def)
+
 add_cab_target(dciman32 1)
index 0150e7f..46766ef 100644 (file)
@@ -1,7 +1,7 @@
 
 set_unicode()
 
-spec2def(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/devmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
+spec2def(devmgr.dll devmgr.spec)
 
 list(APPEND SOURCE
     devmgr.rc
@@ -9,14 +9,14 @@ list(APPEND SOURCE
     devprblm.c
     hwpage.c
     misc.c
-    stubs.c)
+    stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
 
 add_library(devmgr SHARED ${CMAKE_CURRENT_BINARY_DIR}/devmgr_precomp.h.gch ${SOURCE})
 
 set_module_type(devmgr win32dll)
 
 target_link_libraries(devmgr
-    ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def
     uuid
     wine)
 
@@ -29,5 +29,5 @@ add_importlibs(devmgr
     ntdll)
 
 add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(devmgr devmgr_def)
+
 add_cab_target(devmgr 1)
index 62f6ded..be29e48 100644 (file)
@@ -3,7 +3,7 @@ add_definitions(-Dtzset=_tzset)
 
 include_directories(include)
 
-spec2def(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/dhcpcsvc.spec ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def)
+spec2def(dhcpcsvc.dll dhcpcsvc.spec)
 
 list(APPEND SOURCE 
     dhcp/adapter.c
@@ -19,7 +19,8 @@ list(APPEND SOURCE
     dhcp/tables.c
     dhcp/util.c
     dhcpcsvc.c
-    dhcpcsvc.rc)
+    dhcpcsvc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def)
 
 add_library(dhcpcsvc SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_rosdhcp.h.gch
@@ -27,9 +28,9 @@ add_library(dhcpcsvc SHARED
 
 set_module_type(dhcpcsvc win32dll)
 
-target_link_libraries(dhcpcsvc ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def)
+
 
 add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
 add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE})
-add_dependencies(dhcpcsvc dhcpcsvc_def)
+
 add_cab_target(dhcpcsvc 1)
index 5b2f887..30080b3 100644 (file)
@@ -7,7 +7,7 @@ include_directories(
 add_definitions(-D_DLL -D__USE_CRTIMP)
 add_definitions(-DADNS_JGAA_WIN32)
 
-spec2def(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi.spec ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def)
+spec2def(dnsapi.dll dnsapi.spec)
 
 list(APPEND SOURCE 
     dnsapi/adns.c
@@ -17,7 +17,8 @@ list(APPEND SOURCE
     dnsapi/query.c
     dnsapi/record.c
     dnsapi/stubs.c
-    dnsapi.rc)
+    dnsapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def)
 
 add_library(dnsapi SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/dnsapi_precomp.h.gch
@@ -25,11 +26,9 @@ add_library(dnsapi SHARED
 
 set_entrypoint(dnsapi 0)
 
-target_link_libraries(dnsapi
-    ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def
-    adns)
+target_link_libraries(dnsapi adns)
 
 add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
 add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE})
-add_dependencies(dnsapi dnsapi_def psdk buildno_header)
+add_dependencies(dnsapi psdk buildno_header)
 add_cab_target(dnsapi 1)
\ No newline at end of file
index b11168f..520fb55 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(dwmapi ${CMAKE_CURRENT_SOURCE_DIR}/dwmapi.spec ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def)
+spec2def(dwmapi.dll dwmapi.spec)
 
-add_library(dwmapi SHARED dwmapi_main.c version.rc)
+add_library(dwmapi SHARED dwmapi_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def)
 
 set_module_type(dwmapi win32dll)
 
-target_link_libraries(dwmapi
-    ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def
-    wine)
+target_link_libraries(dwmapi wine)
 
 add_importlibs(dwmapi kernel32 ntdll)
-add_dependencies(dwmapi dwmapi_def)
+
 add_cab_target(dwmapi 1)
index 43a8046..58ffce7 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(faultrep ${CMAKE_CURRENT_SOURCE_DIR}/faultrep.spec ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def)
+spec2def(faultrep.dll faultrep.spec)
 
-add_library(faultrep SHARED faultrep.c)
+add_library(faultrep SHARED faultrep.c ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def)
 
 set_module_type(faultrep win32dll)
 
-target_link_libraries(faultrep
-    ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def
-    wine)
+target_link_libraries(faultrep wine)
 
 add_importlibs(faultrep advapi32 kernel32 ntdll)
-add_dependencies(faultrep faultrep_def)
+
 add_cab_target(faultrep 1)
index eaa2334..5a8c2c9 100644 (file)
@@ -1,5 +1,5 @@
 
-spec2def(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/fmifs.spec ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
+spec2def(fmifs.dll fmifs.spec)
 
 list(APPEND SOURCE
     chkdsk.c
@@ -10,15 +10,14 @@ list(APPEND SOURCE
     init.c
     media.c
     query.c
-    fmifs.rc)
+    fmifs.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
 add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_library(fmifs SHARED ${CMAKE_CURRENT_BINARY_DIR}/fmifs_precomp.h.gch ${SOURCE})
 
 set_entrypoint(fmifs InitializeFmIfs@12)
 
-target_link_libraries(fmifs ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
-
 add_importlibs(fmifs kernel32 ntdll)
-add_dependencies(fmifs fmifs_def psdk buildno_header)
+add_dependencies(fmifs psdk buildno_header)
 add_cab_target(fmifs 1)
index 7a5131f..4833dbd 100644 (file)
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(fusion ${CMAKE_CURRENT_SOURCE_DIR}/fusion.spec ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
+spec2def(fusion.dll fusion.spec)
 
 add_library(fusion SHARED
     asmcache.c
@@ -11,14 +11,13 @@ add_library(fusion SHARED
     asmname.c
     assembly.c
     fusion.c
-    fusion_main.c)
+    fusion_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
 set_module_type(fusion win32dll)
 
-target_link_libraries(fusion
-    ${CMAKE_CURRENT_BINARY_DIR}/fusion.def
-    wine)
+target_link_libraries(fusion wine)
 
 add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll)
-add_dependencies(fusion fusion_def)
+
 add_cab_target(fusion 1)
index 78f54ac..416dd0c 100644 (file)
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(gdiplus ${CMAKE_CURRENT_SOURCE_DIR}/gdiplus.spec ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def)
+spec2def(gdiplus.dll gdiplus.spec)
 
 add_library(gdiplus SHARED
     brush.c
@@ -18,12 +18,12 @@ add_library(gdiplus SHARED
     pathiterator.c
     pen.c
     region.c
-    stringformat.c)
+    stringformat.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def)
 
 set_module_type(gdiplus win32dll)
 
 target_link_libraries(gdiplus
-    ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def
     uuid
     wine)
 
@@ -42,5 +42,5 @@ if(ARCH MATCHES amd64)
 target_link_libraries(gdiplus crt)
 endif(ARCH MATCHES amd64)
 
-add_dependencies(gdiplus gdiplus_def)
+
 add_cab_target(gdiplus 1)
index 64a6a23..b73afa8 100644 (file)
@@ -3,14 +3,12 @@ set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(getuname ${CMAKE_CURRENT_SOURCE_DIR}/getuname.spec ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
+spec2def(getuname.dll getuname.spec)
 
-add_library(getuname SHARED getuname.c getuname.rc)
+add_library(getuname SHARED getuname.c getuname.rc ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
 
 set_module_type(getuname win32dll)
 
-target_link_libraries(getuname ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
-
 add_importlibs(getuname kernel32 ntdll)
-add_dependencies(getuname getuname_def)
+
 add_cab_target(getuname 1)
index 5b2f8c7..deccc40 100644 (file)
@@ -10,7 +10,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/nurbtess)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libtess)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libutil)
 
-spec2def(glu32 ${CMAKE_CURRENT_SOURCE_DIR}/glu32.spec ${CMAKE_CURRENT_BINARY_DIR}/glu32.def)
+spec2def(glu32.dll glu32.spec)
 
 add_library(glu32 SHARED
     libnurbs/interface/bezierEval.cc
@@ -101,11 +101,11 @@ add_library(glu32 SHARED
     libutil/mipmap.c
     libutil/project.c
     libutil/quad.c
-    libutil/registry.c)
+    libutil/registry.c
+    ${CMAKE_CURRENT_BINARY_DIR}/glu32.def)
 
 set_entrypoint(glu32 0)
 
-target_link_libraries(glu32 ${CMAKE_CURRENT_BINARY_DIR}/glu32.def)
 add_importlibs(
     glu32
     gcc
@@ -115,5 +115,4 @@ add_importlibs(
     kernel32
     ntdll)
 
-add_dependencies(glu32 glu32_def)
 add_cab_target(glu32 1)
\ No newline at end of file
index 6d1293e..d6882c9 100644 (file)
@@ -34,4 +34,4 @@ add_importlibs(hhctrl
     kernel32
     ntdll)
 
-add_dependencies(hhctrl hhctrl_def)
+
index 378f5e6..343bcc1 100644 (file)
@@ -1,9 +1,13 @@
 
 set_unicode()
 
-list(APPEND SOURCE hid.c stubs.c hid.rc)
+list(APPEND SOURCE
+    hid.c
+    stubs.c
+    hid.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
 
-spec2def(hid ${CMAKE_CURRENT_SOURCE_DIR}/hid.spec ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
+spec2def(hid.dll hid.spec)
 
 add_library(hid SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch
@@ -11,9 +15,9 @@ add_library(hid SHARED
 
 set_module_type(hid win32dll)
 
-target_link_libraries(hid ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
+
 
 add_importlibs(hid kernel32 ntdll)
 add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(hid hid_def)
+
 add_cab_target(hid 1)
index 2190881..d3d0d53 100644 (file)
@@ -2,18 +2,18 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(hlink ${CMAKE_CURRENT_SOURCE_DIR}/hlink.spec ${CMAKE_CURRENT_BINARY_DIR}/hlink.def)
+spec2def(hlink.dll hlink.spec)
 
 add_library(hlink SHARED
     browse_ctx.c
     extserv.c
     hlink_main.c
-    link.c)
+    link.c
+    ${CMAKE_CURRENT_BINARY_DIR}/hlink.def)
 
 set_module_type(hlink win32dll)
 
 target_link_libraries(hlink
-    ${CMAKE_CURRENT_BINARY_DIR}/hlink.def
     uuid
     wine)
 
@@ -25,5 +25,5 @@ add_importlibs(hlink
     kernel32
     ntdll)
 
-add_dependencies(hlink hlink_def)
+
 add_cab_target(hlink 1)
index 1626ae5..7d078a7 100644 (file)
@@ -4,7 +4,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(hnetcfg ${CMAKE_CURRENT_SOURCE_DIR}/hnetcfg.spec ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
+spec2def(hnetcfg.dll hnetcfg.spec)
 
 add_library(hnetcfg SHARED
     apps.c
@@ -14,13 +14,12 @@ add_library(hnetcfg SHARED
     port.c
     profile.c
     regsvr.c
-    service.c)
+    service.c
+    ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
 
 set_module_type(hnetcfg win32dll)
 
-target_link_libraries(hnetcfg
-    ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def
-    wine)
+target_link_libraries(hnetcfg wine)
 
 add_importlibs(hnetcfg
     ole32
@@ -28,5 +27,5 @@ add_importlibs(hnetcfg
     kernel32
     ntdll)
 
-add_dependencies(hnetcfg hnetcfg_def)
+
 add_cab_target(hnetcfg 1)
index 3a44c85..0c90507 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(httpapi ${CMAKE_CURRENT_SOURCE_DIR}/httpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def)
+spec2def(httpapi.dll httpapi.spec)
 
-add_library(httpapi SHARED httpapi_main.c)
+add_library(httpapi SHARED httpapi_main.c ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def)
 
 set_module_type(httpapi win32dll)
 
-target_link_libraries(httpapi
-    ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def
-    wine)
+target_link_libraries(httpapi wine)
 
 add_importlibs(httpapi kernel32 ntdll)
-add_dependencies(httpapi httpapi_def)
+
 add_cab_target(httpapi 1)
index c974e3a..0db34a5 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(iccvid ${CMAKE_CURRENT_SOURCE_DIR}/iccvid.spec ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)
+spec2def(iccvid.dll iccvid.spec)
 
-add_library(iccvid SHARED iccvid.c rsrc.rc)
+add_library(iccvid SHARED iccvid.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)
 
 set_module_type(iccvid win32dll)
 
-target_link_libraries(iccvid
-    ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def
-    wine)
+target_link_libraries(iccvid wine)
 
 add_importlibs(iccvid user32 kernel32 ntdll)
-add_dependencies(iccvid iccvid_def)
+
 add_cab_target(iccvid 1)
index 9f6b2f7..ec44191 100644 (file)
@@ -1,16 +1,14 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(icmp ${CMAKE_CURRENT_SOURCE_DIR}/icmp.spec ${CMAKE_CURRENT_BINARY_DIR}/icmp.def)
+spec2def(icmp.dll icmp.spec)
 
-add_library(icmp SHARED icmp_main.c icmp.rc)
+add_library(icmp SHARED icmp_main.c icmp.rc ${CMAKE_CURRENT_BINARY_DIR}/icmp.def)
 
 set_module_type(icmp win32dll)
 
-target_link_libraries(icmp
-    ${CMAKE_CURRENT_BINARY_DIR}/icmp.def
-    wine)
+target_link_libraries(icmp wine)
 
 add_importlibs(icmp ws2_32 kernel32 ntdll)
-add_dependencies(icmp icmp_def psdk)
+add_dependencies(icmp psdk)
 add_cab_target(icmp 1)
index bab0157..25dda5b 100644 (file)
@@ -21,5 +21,5 @@ target_link_libraries(imaadp32.acm
     wine)
 
 add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(imaadp32.acm imaadp32.acm_def psdk buildno_header)
+add_dependencies(imaadp32.acm psdk buildno_header)
 add_cab_target(imaadp32.acm 1)
index e9198f9..37677f1 100644 (file)
@@ -4,14 +4,15 @@ add_definitions(-D_IMAGEHLP_SOURCE_)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/imagehlp.spec ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def)
+spec2def(imagehlp.dll imagehlp.spec)
 
 list(APPEND SOURCE
     access.c
     imagehlp_main.c
     integrity.c
     modify.c
-    imagehlp.rc)
+    imagehlp.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def)
 
 add_library(imagehlp SHARED 
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_precomp.h.gch
@@ -19,11 +20,9 @@ add_library(imagehlp SHARED
 
 set_module_type(imagehlp win32dll)
 
-target_link_libraries(imagehlp
-    ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def
-    wine)
+target_link_libraries(imagehlp wine)
 
 add_importlibs(imagehlp dbghelp kernel32 ntdll)
 add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(imagehlp imagehlp_def)
+
 add_cab_target(imagehlp 1)
index 7ef770f..4946a50 100644 (file)
@@ -6,16 +6,14 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(imm32 ${CMAKE_CURRENT_SOURCE_DIR}/imm32.spec ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
+spec2def(imm32.dll imm32.spec)
 
-add_library(imm32 SHARED imm.c version.rc)
+add_library(imm32 SHARED imm.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
 
 set_module_type(imm32 win32dll)
 
-target_link_libraries(imm32
-    ${CMAKE_CURRENT_BINARY_DIR}/imm32.def
-    wine)
+target_link_libraries(imm32 wine)
 
 add_importlibs(imm32 advapi32 user32 kernel32 ntdll)
-add_dependencies(imm32 imm32_def)
+
 add_cab_target(imm32 1)
index 83c7196..59e58e2 100644 (file)
@@ -4,7 +4,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(inetcomm ${CMAKE_CURRENT_SOURCE_DIR}/inetcomm.spec ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
+spec2def(inetcomm.dll inetcomm.spec)
 
 add_library(inetcomm SHARED
     imaptransport.c
@@ -14,12 +14,12 @@ add_library(inetcomm SHARED
     mimeole.c
     pop3transport.c
     regsvr.c
-    smtptransport.c)
+    smtptransport.c
+    ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
 
 set_module_type(inetcomm win32dll)
 
 target_link_libraries(inetcomm
-    ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def
     uuid
     wine)
 
@@ -32,5 +32,5 @@ add_importlibs(inetcomm
     kernel32
     ntdll)
 
-add_dependencies(inetcomm inetcomm_def)
+
 add_cab_target(inetcomm 1)
index 05c1750..0c51697 100644 (file)
@@ -3,15 +3,13 @@ add_definitions(-D__WINESRC__)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(inetmib1 ${CMAKE_CURRENT_SOURCE_DIR}/inetmib1.spec ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def)
+spec2def(inetmib1.dll inetmib1.spec)
 
-add_library(inetmib1 SHARED main.c)
+add_library(inetmib1 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def)
 
 set_module_type(inetmib1 win32dll)
 
-target_link_libraries(inetmib1
-    ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def
-    wine)
+target_link_libraries(inetmib1 wine)
 
 add_importlibs(inetmib1
     msvcrt
@@ -20,5 +18,5 @@ add_importlibs(inetmib1
     kernel32
     ntdll)
 
-add_dependencies(inetmib1 inetmib1_def)
+
 add_cab_target(inetmib1 1)
index f1d8eb7..2c926e5 100644 (file)
@@ -2,16 +2,14 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(initpki ${CMAKE_CURRENT_SOURCE_DIR}/initpki.spec ${CMAKE_CURRENT_BINARY_DIR}/initpki.def)
+spec2def(initpki.dll initpki.spec)
 
-add_library(initpki SHARED main.c)
+add_library(initpki SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/initpki.def)
 
 set_module_type(initpki win32dll)
 
-target_link_libraries(initpki
-    ${CMAKE_CURRENT_BINARY_DIR}/initpki.def
-    wine)
+target_link_libraries(initpki wine)
 
 add_importlibs(initpki kernel32 ntdll)
-add_dependencies(initpki initpki_def)
+
 add_cab_target(initpki 1)
index ec1e252..970a221 100644 (file)
@@ -4,14 +4,13 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(inseng ${CMAKE_CURRENT_SOURCE_DIR}/inseng.spec ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
+spec2def(inseng.dll inseng.spec)
 
-add_library(inseng SHARED inseng_main.c regsvr.c)
+add_library(inseng SHARED inseng_main.c regsvr.c ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
 
 set_module_type(inseng win32dll)
 
 target_link_libraries(inseng
-    ${CMAKE_CURRENT_BINARY_DIR}/inseng.def
     uuid
     wine)
 
@@ -21,5 +20,5 @@ add_importlibs(inseng
     kernel32
     ntdll)
 
-add_dependencies(inseng inseng_def)
+
 add_cab_target(inseng 1)
index ec4811b..44b3013 100644 (file)
@@ -8,7 +8,7 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include
     ${REACTOS_SOURCE_DIR}/lib/tdilib)
 
-spec2def(iphlpapi ${CMAKE_CURRENT_SOURCE_DIR}/iphlpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
+spec2def(iphlpapi.dll iphlpapi.spec)
 
 add_library(iphlpapi SHARED 
     dhcp_reactos.c
@@ -19,15 +19,15 @@ add_library(iphlpapi SHARED
     registry.c
     resinfo_reactos.c
     route_reactos.c
-    iphlpapi.rc)
+    iphlpapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
 
 set_module_type(iphlpapi win32dll)
 
 target_link_libraries(iphlpapi
-    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def
     wine
     tdilib)
 
 add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
-add_dependencies(iphlpapi iphlpapi_def)
+
 add_cab_target(iphlpapi 1)
index 661d556..67f1202 100644 (file)
@@ -2,16 +2,14 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
+spec2def(itircl.dll itircl.spec)
 
-add_library(itircl SHARED itircl_main.c)
+add_library(itircl SHARED itircl_main.c ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
 
 set_module_type(itircl win32dll)
 
-target_link_libraries(itircl
-    ${CMAKE_CURRENT_BINARY_DIR}/itircl.def
-    wine)
+target_link_libraries(itircl wine)
 
 add_importlibs(itircl kernel32 ntdll)
-add_dependencies(itircl itircl_def psdk)
+add_dependencies(itircl psdk)
 add_cab_target(itircl 1)
index 661d556..67f1202 100644 (file)
@@ -2,16 +2,14 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
+spec2def(itircl.dll itircl.spec)
 
-add_library(itircl SHARED itircl_main.c)
+add_library(itircl SHARED itircl_main.c ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
 
 set_module_type(itircl win32dll)
 
-target_link_libraries(itircl
-    ${CMAKE_CURRENT_BINARY_DIR}/itircl.def
-    wine)
+target_link_libraries(itircl wine)
 
 add_importlibs(itircl kernel32 ntdll)
-add_dependencies(itircl itircl_def psdk)
+add_dependencies(itircl psdk)
 add_cab_target(itircl 1)
index 3d4619d..791937e 100644 (file)
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__ -D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(itss ${CMAKE_CURRENT_SOURCE_DIR}/itss.spec ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
+spec2def(itss.dll itss.spec)
 
 add_library(itss SHARED
     chm_lib.c
@@ -11,12 +11,12 @@ add_library(itss SHARED
     moniker.c
     protocol.c
     storage.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
 
 set_module_type(itss win32dll)
 
 target_link_libraries(itss
-    ${CMAKE_CURRENT_BINARY_DIR}/itss.def
     uuid
     wine)
 
@@ -27,5 +27,5 @@ add_importlibs(itss
     kernel32
     ntdll)
 
-add_dependencies(itss itss_def wineheaders)
+add_dependencies(itss wineheaders)
 add_cab_target(itss 1)
index 923f005..477e3d0 100644 (file)
@@ -11,7 +11,7 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(jscript ${CMAKE_CURRENT_SOURCE_DIR}/jscript.spec ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
+spec2def(jscript.dll jscript.spec)
 
 add_library(jscript SHARED
     activex.c
@@ -33,13 +33,12 @@ add_library(jscript SHARED
     bool.c
     function.c
     global.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
 
 set_module_type(jscript win32dll)
 
-target_link_libraries(jscript
-    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def
-    wine)
+target_link_libraries(jscript wine)
 
 add_importlibs(jscript
     msvcrt
@@ -50,5 +49,5 @@ add_importlibs(jscript
     kernel32
     ntdll)
 
-add_dependencies(jscript jsglobal jscript_def stdole2)
+add_dependencies(jscript jsglobal stdole2)
 add_cab_target(jscript 1)
index f9f6bf0..03a8a94 100644 (file)
@@ -2,9 +2,9 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(loadperf ${CMAKE_CURRENT_SOURCE_DIR}/loadperf.spec ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def)
+spec2def(loadperf.dll loadperf.spec)
 
-add_library(loadperf SHARED loadperf_main.c)
+add_library(loadperf SHARED loadperf_main.c ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def)
 
 set_module_type(loadperf win32dll)
 
@@ -13,5 +13,5 @@ target_link_libraries(loadperf
     wine)
 
 add_importlibs(loadperf kernel32 ntdll)
-add_dependencies(loadperf loadperf_def)
+
 add_cab_target(loadperf 1)
index a9519c4..189d00d 100644 (file)
@@ -4,18 +4,18 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(localspl ${CMAKE_CURRENT_SOURCE_DIR}/localspl.spec ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)
+spec2def(localspl.dll localspl.spec)
 
 add_library(localspl SHARED
     localmon.c
     localspl_main.c
     provider.c
-    localspl.rc)
+    localspl.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)
 
 set_module_type(localspl win32dll)
 
 target_link_libraries(localspl
-    ${CMAKE_CURRENT_BINARY_DIR}/localspl.def
     wine)
 
 add_importlibs(localspl
@@ -25,5 +25,5 @@ add_importlibs(localspl
     kernel32
     ntdll)
 
-add_dependencies(localspl localspl_def)
+
 add_cab_target(localspl 1)
index 474484e..61aba21 100644 (file)
@@ -2,17 +2,16 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(localui ${CMAKE_CURRENT_SOURCE_DIR}/localui.spec ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
+spec2def(localui.dll localui.spec)
 
-add_library(localui SHARED localui.c localui.rc)
+add_library(localui SHARED localui.c localui.rc ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
 
 set_module_type(localui win32dll)
 
 target_link_libraries(localui
-    ${CMAKE_CURRENT_BINARY_DIR}/localui.def
     uuid
     wine)
 
 add_importlibs(localui winspool user32 kernel32 ntdll)
-add_dependencies(localui localui_def)
+
 add_cab_target(localui 1)
index 434d560..78f864d 100644 (file)
@@ -4,14 +4,12 @@ set_unicode()
 add_definitions(-DLANGPACK)
 include_directories(include)
 
-spec2def(lpk ${CMAKE_CURRENT_SOURCE_DIR}/lpk.spec ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
+spec2def(lpk.dll lpk.spec)
 
-add_library(lpk SHARED dllmain.c stub.c lpk.rc)
+add_library(lpk SHARED dllmain.c stub.c lpk.rc ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
 
 set_module_type(lpk win32dll)
 
-target_link_libraries(lpk ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
-
 add_importlibs(lpk user32 usp10 kernel32 ntdll)
-add_dependencies(lpk lpk_def)
+
 add_cab_target(lpk 1)
index 0458c8c..cc53a37 100644 (file)
@@ -4,7 +4,7 @@ set_unicode()
 include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
 
-spec2def(lsasrv ${CMAKE_CURRENT_SOURCE_DIR}/lsasrv.spec ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
+spec2def(lsasrv.dll lsasrv.spec)
 
 add_library(lsasrv SHARED
     authport.c
@@ -12,16 +12,16 @@ add_library(lsasrv SHARED
     lsasrv.c
     privileges.c
     sids.c
-    lsasrv.rc)
+    lsasrv.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
 
 set_entrypoint(lsasrv 0)
 
 target_link_libraries(lsasrv
-    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def
     lsa_server
     wine
     pseh)
 
 add_importlibs(lsasrv rpcrt4 kernel32 ntdll)
-add_dependencies(lsasrv lsasrv_def  psdk buildno_header)
+add_dependencies(lsasrv  psdk buildno_header)
 add_cab_target(lsasrv 1)
\ No newline at end of file
index 4037575..4a646a4 100644 (file)
@@ -2,16 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(lz32 ${CMAKE_CURRENT_SOURCE_DIR}/lz32.spec ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
+spec2def(lz32.dll lz32.spec)
 
-add_library(lz32 SHARED version.rc)
+add_library(lz32 SHARED version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
 
 set_entrypoint(lz32 0)
 
-target_link_libraries(lz32
-    ${CMAKE_CURRENT_BINARY_DIR}/lz32.def
-    wine)
+target_link_libraries(lz32 wine)
 
 add_importlibs(lz32 kernel32 ntdll)
-add_dependencies(lz32 lz32_def psdk buildno_header)
+add_dependencies(lz32 psdk buildno_header)
 add_cab_target(lz32 1)
\ No newline at end of file
index bf48763..b14661f 100644 (file)
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mapi32 ${CMAKE_CURRENT_SOURCE_DIR}/mapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def)
+spec2def(mapi32.dll mapi32.spec)
 
 add_library(mapi32 SHARED
     imalloc.c
@@ -10,15 +10,15 @@ add_library(mapi32 SHARED
     prop.c
     sendmail.c
     util.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def)
 
 set_module_type(mapi32 win32dll)
 
 target_link_libraries(mapi32
-    ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def
     wine
     uuid)
 
 add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll)
-add_dependencies(mapi32 mapi32_def)
+
 add_cab_target(mapi32 1)
index 49f2df7..60e2dda 100644 (file)
@@ -2,21 +2,20 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciavi32 ${CMAKE_CURRENT_SOURCE_DIR}/mciavi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
+spec2def(mciavi32.dll mciavi32.spec)
 
 add_library(mciavi32 SHARED
     info.c
     mciavi.c
     mmoutput.c
     wnd.c
-    mciavi_res.rc)
+    mciavi_res.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
 
 set_module_type(mciavi32 win32dll)
 
-target_link_libraries(mciavi32
-    ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def
-    wine)
+target_link_libraries(mciavi32 wine)
 
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll)
-add_dependencies(mciavi32 mciavi32_def)
+
 add_cab_target(mciavi32 1)
index d3b3aee..85a2789 100644 (file)
@@ -2,16 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mcicda ${CMAKE_CURRENT_SOURCE_DIR}/mcicda.spec ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def)
+spec2def(mcicda.dll mcicda.spec)
 
-add_library(mcicda SHARED mcicda.c)
+add_library(mcicda SHARED mcicda.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def)
 
 set_entrypoint(mcicda 0)
 
-target_link_libraries(mcicda
-    ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def
-    wine)
+target_link_libraries(mcicda wine)
 
 add_importlibs(mcicda winmm user32 kernel32 ntdll)
-add_dependencies(mcicda mcicda_def psdk buildno_header)
+add_dependencies(mcicda psdk buildno_header)
 add_cab_target(mcicda 1)
\ No newline at end of file
index e1bb8aa..3c62f7d 100644 (file)
@@ -2,17 +2,16 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciqtz32 ${CMAKE_CURRENT_SOURCE_DIR}/mciqtz32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
+spec2def(mciqtz32.dll mciqtz32.spec)
 
-add_library(mciqtz32 SHARED mciqtz.c version.rc)
+add_library(mciqtz32 SHARED mciqtz.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
 
 set_module_type(mciqtz32 win32dll)
 
 target_link_libraries(mciqtz32
-    ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def
     wine
     strmiids)
 
 add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll)
-add_dependencies(mciqtz32 mciqtz32_def)
+
 add_cab_target(mciqtz32 1)
index 87feac6..b28c3a8 100644 (file)
@@ -2,16 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciseq ${CMAKE_CURRENT_SOURCE_DIR}/mciseq.spec ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
+spec2def(mciseq.dll mciseq.spec)
 
-add_library(mciseq SHARED mcimidi.c)
+add_library(mciseq SHARED mcimidi.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
 
 set_entrypoint(mciseq 0)
 
-target_link_libraries(mciseq
-    ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def
-    wine)
+target_link_libraries(mciseq wine)
 
 add_importlibs(mciseq winmm user32 kernel32 ntdll)
-add_dependencies(mciseq mciseq_def psdk buildno_header)
+add_dependencies(mciseq psdk buildno_header)
 add_cab_target(mciseq 1)
\ No newline at end of file
index 5a0eb21..36d3dc3 100644 (file)
@@ -5,16 +5,15 @@ add_definitions(-D_WINE)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciwave ${CMAKE_CURRENT_SOURCE_DIR}/mciwave.spec ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
+spec2def(mciwave.dll mciwave.spec)
 
-add_library(mciwave SHARED mciwave.c)
+add_library(mciwave SHARED mciwave.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
 
 set_entrypoint(mciwave 0)
 
-target_link_libraries(mciwave
-    ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def
-    wine)
+target_link_libraries(mciwave wine)
 
 add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(mciwave mciwave_def psdk buildno_header)
+add_dependencies(mciwave psdk buildno_header)
 add_cab_target(mciwave 1)
index daf5328..6939e44 100644 (file)
@@ -4,14 +4,14 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mlang ${CMAKE_CURRENT_SOURCE_DIR}/mlang.spec ${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
+spec2def(mlang.dll mlang.spec)
 
-add_library(mlang SHARED mlang.c regsvr.c)
+add_library(mlang SHARED mlang.c regsvr.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
 
 set_entrypoint(mlang 0)
 
 target_link_libraries(mlang
-    ${CMAKE_CURRENT_BINARY_DIR}/mlang.def
     uuid
     wine)
 
@@ -24,5 +24,5 @@ add_importlibs(mlang
     kernel32
     ntdll)
 
-add_dependencies(mlang mlang_def psdk buildno_header)
+add_dependencies(mlang psdk buildno_header)
 add_cab_target(mlang 1)
\ No newline at end of file
index 4d502b4..e0aa8b0 100644 (file)
@@ -3,7 +3,7 @@ set_unicode()
 
 add_definitions(-DNDEBUG)
 
-spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
+spec2def(mmdrv.dll mmdrv.spec)
 
 add_library(mmdrv SHARED
     entry.c
@@ -12,12 +12,11 @@ add_library(mmdrv SHARED
     session.c
     common.c
     wave.c
-    wave_io.c)
+    wave_io.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
 set_entrypoint(mmdrv 0)
 
-target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
-
 add_importlibs(mmdrv winmm user32 kernel32 ntdll)
-add_dependencies(mmdrv mmdrv_def psdk buildno_header)
+add_dependencies(mmdrv psdk buildno_header)
 add_cab_target(mmdrv 1)
\ No newline at end of file
index c03dbcd..fffedb4 100644 (file)
@@ -1,14 +1,12 @@
 
 set_unicode()
 
-spec2def(modemui ${CMAKE_CURRENT_SOURCE_DIR}/modemui.spec ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
+spec2def(modemui.dll modemui.spec)
 
-add_library(modemui SHARED modemui.c modemui.rc)
+add_library(modemui SHARED modemui.c modemui.rc ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
 
 set_module_type(modemui win32dll)
 
-target_link_libraries(modemui ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
-
 add_importlibs(modemui kernel32)
-add_dependencies(modemui modemui_def)
+
 add_cab_target(modemui 1)
index be03b20..c695641 100644 (file)
@@ -4,7 +4,7 @@ add_definitions(-D_WINE)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mpr ${CMAKE_CURRENT_SOURCE_DIR}/mpr.spec ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
+spec2def(mpr.dll mpr.spec)
 
 add_library(mpr SHARED
     auth.c
@@ -13,14 +13,13 @@ add_library(mpr SHARED
     nps.c
     pwcache.c
     wnet.c
-    mpr.rc)
+    mpr.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
 
 set_module_type(mpr win32dll)
 
-target_link_libraries(mpr
-    ${CMAKE_CURRENT_BINARY_DIR}/mpr.def
-    wine)
+target_link_libraries(mpr wine)
 
 add_importlibs(mpr advapi32 user32 kernel32 ntdll)
-add_dependencies(mpr mpr_def)
+
 add_cab_target(mpr 1)
index 74b2181..0c879d1 100644 (file)
@@ -2,16 +2,14 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mprapi ${CMAKE_CURRENT_SOURCE_DIR}/mprapi.spec ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
+spec2def(mprapi.dll mprapi.spec)
 
-add_library(mprapi SHARED mprapi.c)
+add_library(mprapi SHARED mprapi.c ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
 
 set_module_type(mprapi win32dll)
 
-target_link_libraries(mprapi
-    ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def
-    wine)
+target_link_libraries(mprapi wine)
 
 add_importlibs(mprapi kernel32 ntdll)
-add_dependencies(mprapi mprapi_def)
+
 add_cab_target(mprapi 1)
index 1b48c28..23ff515 100644 (file)
@@ -4,7 +4,7 @@ set_unicode()
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msacm32 ${CMAKE_CURRENT_SOURCE_DIR}/msacm32.spec ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
+spec2def(msacm32.dll msacm32.spec)
 
 add_library(msacm32 SHARED
     driver.c
@@ -13,16 +13,15 @@ add_library(msacm32 SHARED
     internal.c
     msacm32_main.c
     pcmconverter.c
-    stream.c)
+    stream.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
 
 set_module_type(msacm32 win32dll)
 
-target_link_libraries(msacm32
-    ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def
-    wine)
+target_link_libraries(msacm32 wine)
 
 add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
-add_dependencies(msacm32 msacm32_def)
+
 
 add_subdirectory(msacm32.drv)
 add_cab_target(msacm32 1)
index 7da42f6..b28021b 100644 (file)
@@ -20,5 +20,5 @@ target_link_libraries(msacm32.drv
     wine)
 
 add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll)
-add_dependencies(msacm32.drv msacm32.drv_def psdk buildno_header)
+add_dependencies(msacm32.drv psdk buildno_header)
 add_cab_target(msacm32.drv 1)
\ No newline at end of file
index 4f00807..6d05321 100644 (file)
@@ -21,5 +21,5 @@ target_link_libraries(msadp32.acm
     wine)
 
 add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(msadp32.acm msadp32.acm_def psdk buildno_header)
+add_dependencies(msadp32.acm psdk buildno_header)
 add_cab_target(msadp32.acm 1)
index cdaadae..a79a759 100644 (file)
@@ -4,7 +4,7 @@ set_unicode()
 include_directories(BEFORE include)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 
-spec2def(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.spec ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
+spec2def(msafd.dll msafd.spec)
 
 list(APPEND SOURCE
     msafd.rc
@@ -12,7 +12,8 @@ list(APPEND SOURCE
     misc/event.c
     misc/helpers.c
     misc/sndrcv.c
-    misc/stubs.c)
+    misc/stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
 
 add_library(msafd SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch
@@ -20,10 +21,8 @@ add_library(msafd SHARED
 
 set_module_type(msafd win32dll)
 
-target_link_libraries(msafd ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
-
 add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE})
 
 add_importlibs(msafd advapi32 kernel32 ntdll)
-add_dependencies(msafd msafd_def)
+
 add_cab_target(msafd 1)
index d1a7cab..9138cfd 100644 (file)
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mscat32 ${CMAKE_CURRENT_SOURCE_DIR}/mscat32.spec ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
+spec2def(mscat32.dll mscat32.spec)
 
-add_library(mscat32 SHARED main.c)
+add_library(mscat32 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
 
 set_module_type(mscat32 win32dll)
 
-target_link_libraries(mscat32
-    ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def
-    wine)
+target_link_libraries(mscat32 wine)
 
 add_importlibs(mscat32 wintrust kernel32 ntdll)
-add_dependencies(mscat32 mscat32_def)
+
 add_cab_target(mscat32 1)
index 11c618e..d68dc90 100644 (file)
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mscms ${CMAKE_CURRENT_SOURCE_DIR}/mscms.spec ${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
+spec2def(mscms.dll mscms.spec)
 
 add_library(mscms SHARED
     handle.c
@@ -11,14 +11,13 @@ add_library(mscms SHARED
     profile.c
     stub.c
     transform.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
 
 set_module_type(mscms win32dll)
 
-target_link_libraries(mscms
-    ${CMAKE_CURRENT_BINARY_DIR}/mscms.def
-    wine)
+target_link_libraries(mscms wine)
 
 add_importlibs(mscms kernel32 ntdll)
-add_dependencies(mscms mscms_def)
+
 add_cab_target(mscms 1)
index 6cc5533..8a2d707 100644 (file)
@@ -2,17 +2,16 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mscoree ${CMAKE_CURRENT_SOURCE_DIR}/mscoree.spec ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
+spec2def(mscoree.dll mscoree.spec)
 
-add_library(mscoree SHARED corruntimehost.c mscoree_main.c)
+add_library(mscoree SHARED corruntimehost.c mscoree_main.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
 
 set_module_type(mscoree win32dll)
 
 target_link_libraries(mscoree
-    ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def
     wine
     uuid)
 
 add_importlibs(mscoree advapi32 shell32 kernel32 ntdll)
-add_dependencies(mscoree mscoree_def)
+
 add_cab_target(mscoree 1)
index 1c9f187..d02b270 100644 (file)
@@ -5,7 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msctf ${CMAKE_CURRENT_SOURCE_DIR}/msctf.spec ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
+spec2def(msctf.dll msctf.spec)
 
 add_library(msctf SHARED
     categorymgr.c
@@ -19,15 +19,15 @@ add_library(msctf SHARED
     range.c
     regsvr.c
     threadmgr.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
 
 set_module_type(msctf win32dll)
 
 target_link_libraries(msctf
-    ${CMAKE_CURRENT_BINARY_DIR}/msctf.def
     uuid
     wine)
 
 add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll)
-add_dependencies(msctf msctf_def)
+
 add_cab_target(msctf 1)
index 44611a7..2d25228 100644 (file)
@@ -2,20 +2,19 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msftedit ${CMAKE_CURRENT_SOURCE_DIR}/msftedit.spec ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def)
+spec2def(msftedit.dll msftedit.spec)
 
 add_library(msftedit SHARED
     msftedit_main.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def)
 
 set_module_type(msftedit win32dll)
 
 target_link_libraries(msftedit
-    ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def
     uuid
     wine)
 
 add_importlibs(msftedit riched20 kernel32 ntdll)
 
-add_dependencies(msftedit msftedit_def)
 add_cab_target(msftedit 1)
index 41f999d..04a7dc2 100644 (file)
@@ -21,5 +21,5 @@ target_link_libraries(msg711.acm
     wine)
 
 add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(msg711.acm msg711.acm_def psdk buildno_header)
+add_dependencies(msg711.acm psdk buildno_header)
 add_cab_target(msg711.acm 1)
index 386cbc7..21b5576 100644 (file)
@@ -2,21 +2,20 @@
 include_directories(include)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msgina ${CMAKE_CURRENT_SOURCE_DIR}/msgina.spec ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
+spec2def(msgina.dll msgina.spec)
 
 add_library(msgina SHARED
     gui.c
     msgina.c
     stubs.c
     tui.c
-    msgina.rc)
+    msgina.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
 
 set_module_type(msgina win32dll)
 
-target_link_libraries(msgina
-    ${CMAKE_CURRENT_BINARY_DIR}/msgina.def
-    wine)
+target_link_libraries(msgina wine)
 
 add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll)
-add_dependencies(msgina msgina_def)
+
 add_cab_target(msgina 1)
index d139c8a..69f766b 100644 (file)
@@ -21,5 +21,5 @@ target_link_libraries(msgsm32.acm
     wine)
 
 add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(msgsm32.acm msgsm32.acm_def psdk buildno_header)
+add_dependencies(msgsm32.acm psdk buildno_header)
 add_cab_target(msgsm32.acm 1)
index 9c36835..c899231 100644 (file)
@@ -18,7 +18,7 @@ add_library(mshtml.tlb SHARED rsrc.rc)
 set_entrypoint(mshtml.tlb 0)
 set_target_properties(mshtml.tlb PROPERTIES SUFFIX "")
 
-target_link_libraries(mshtml.tlb ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def)
+
 
 add_dependencies(mshtml.tlb mshtml_tlb mshtml.tlb_def)
 add_cab_target(mshtml.tlb 1)
index 1ac233d..72bb2e4 100644 (file)
@@ -11,7 +11,7 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mshtml ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.spec ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
+spec2def(mshtml.dll mshtml.spec)
 
 add_library(mshtml SHARED
     conpoint.c
@@ -75,12 +75,12 @@ add_library(mshtml SHARED
     task.c
     txtrange.c
     view.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
 
 set_module_type(mshtml win32dll)
 
 target_link_libraries(mshtml
-    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def
     uuid
     wine
     strmiids
@@ -99,5 +99,5 @@ add_importlibs(mshtml
     kernel32
     ntdll)
 
-add_dependencies(mshtml mshtml_nsiface_header mshtml_def)
+add_dependencies(mshtml mshtml_nsiface_header)
 add_cab_target(mshtml 1)
index efef097..6bd067b 100644 (file)
@@ -2,16 +2,14 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(msimg32 ${CMAKE_CURRENT_SOURCE_DIR}/msimg32.spec ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
+spec2def(msimg32.dll msimg32.spec)
 
-add_library(msimg32 SHARED msimg32_main.c)
+add_library(msimg32 SHARED msimg32_main.c ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
 
 set_module_type(msimg32 win32dll)
 
-target_link_libraries(msimg32
-    ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def
-    wine)
+target_link_libraries(msimg32 wine)
 
 add_importlibs(msimg32 gdi32 kernel32 ntdll)
-add_dependencies(msimg32 msimg32_def)
+
 add_cab_target(msimg32 1)
index 2d889ef..d4a5b3a 100644 (file)
@@ -2,20 +2,20 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msimtf ${CMAKE_CURRENT_SOURCE_DIR}/msimtf.spec ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
+spec2def(msimtf.dll msimtf.spec)
 
 add_library(msimtf SHARED
     activeimmapp.c
     main.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
 
 set_module_type(msimtf win32dll)
 
 target_link_libraries(msimtf
-    ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def
     uuid
     wine)
 
 add_importlibs(msimtf msvcrt imm32 kernel32 ntdll)
-add_dependencies(msimtf msimtf_def)
+
 add_cab_target(msimtf 1)
index 82c79e9..4bdaf61 100644 (file)
@@ -2,16 +2,14 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msisip ${CMAKE_CURRENT_SOURCE_DIR}/msisip.spec ${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
+spec2def(msisip.dll msisip.spec)
 
-add_library(msisip SHARED main.c)
+add_library(msisip SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
 
 set_module_type(msisip win32dll)
 
-target_link_libraries(msisip
-    ${CMAKE_CURRENT_BINARY_DIR}/msisip.def
-    wine)
+target_link_libraries(msisip wine)
 
 add_importlibs(msisip crypt32 ole32 kernel32 ntdll)
-add_dependencies(msisip msisip_def)
+
 add_cab_target(msisip 1)
index 66f2199..9d53dee 100644 (file)
@@ -14,4 +14,4 @@ target_link_libraries(msisys
     wine)
 
 add_importlibs(msisys kernel32 ntdll)
-add_dependencies(msisys msisys_def)
+
index cfed51e..da49394 100644 (file)
@@ -2,16 +2,14 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(msnet32 ${CMAKE_CURRENT_SOURCE_DIR}/msnet32.spec ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
+spec2def(msnet32.dll msnet32.spec)
 
-add_library(msnet32 SHARED msnet_main.c)
+add_library(msnet32 SHARED msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
 
 set_module_type(msnet32 win32dll)
 
-target_link_libraries(msnet32
-    ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def
-    wine)
+target_link_libraries(msnet32 wine)
 
 add_importlibs(msnet32 kernel32 ntdll)
-add_dependencies(msnet32 msnet32_def)
+
 add_cab_target(msnet32 1)
index 736d5a0..d345452 100644 (file)
@@ -4,16 +4,14 @@ add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msrle32 ${CMAKE_CURRENT_SOURCE_DIR}/msrle32.spec ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def)
+spec2def(msrle32.dll msrle32.spec)
 
-add_library(msrle32 SHARED msrle32.c rsrc.rc)
+add_library(msrle32 SHARED msrle32.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def)
 
 set_module_type(msrle32 win32dll)
 
-target_link_libraries(msrle32
-    ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def
-    wine)
+target_link_libraries(msrle32 wine)
 
 add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll)
-add_dependencies(msrle32 msrle32_def)
+
 add_cab_target(msrle32 1)
index 2d1ba4c..687397e 100644 (file)
@@ -2,16 +2,14 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(mssign32 ${CMAKE_CURRENT_SOURCE_DIR}/mssign32.spec ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def)
+spec2def(mssign32.dll mssign32.spec)
 
-add_library(mssign32 SHARED mssign32_main.c)
+add_library(mssign32 SHARED mssign32_main.c ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def)
 
 set_module_type(mssign32 win32dll)
 
-target_link_libraries(mssign32
-    ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def
-    wine)
+target_link_libraries(mssign32 wine)
 
 add_importlibs(mssign32 kernel32 ntdll)
-add_dependencies(mssign32 mssign32_def)
+
 add_cab_target(mssign32 1)
index 65c3dcc..972ab84 100644 (file)
@@ -2,16 +2,14 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(mssip32 ${CMAKE_CURRENT_SOURCE_DIR}/mssip32.spec ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def)
+spec2def(mssip32.dll mssip32.spec)
 
-add_library(mssip32 SHARED main.c)
+add_library(mssip32 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def)
 
 set_module_type(mssip32 win32dll)
 
-target_link_libraries(mssip32
-    ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def
-    wine)
+target_link_libraries(mssip32 wine)
 
 add_importlibs(mssip32 kernel32 ntdll)
-add_dependencies(mssip32 mssip32_def)
+
 add_cab_target(mssip32 1)
index 5eb2ae1..9ac59b9 100644 (file)
@@ -9,7 +9,7 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mstask ${CMAKE_CURRENT_SOURCE_DIR}/mstask.spec ${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
+spec2def(mstask.dll mstask.spec)
 
 add_library(mstask SHARED
     factory.c
@@ -17,16 +17,16 @@ add_library(mstask SHARED
     task.c
     task_scheduler.c
     task_trigger.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
 
 set_module_type(mstask win32dll)
 
 target_link_libraries(mstask
-    ${CMAKE_CURRENT_BINARY_DIR}/mstask.def
     mstask_local_interface
     uuid
     wine)
 
 add_importlibs(mstask ole32 ntdll)
-add_dependencies(mstask mstask_def)
+
 add_cab_target(mstask 1)
index e556306..f8d0c53 100644 (file)
@@ -4,16 +4,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 add_definitions(-DCRTDLL)
 
-spec2def(msvcrt20 ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt20.spec ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
+spec2def(msvcrt20.dll msvcrt20.spec)
 
-add_library(msvcrt20 SHARED msvcrt20.c)
+add_library(msvcrt20 SHARED msvcrt20.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
 
 set_entrypoint(msvcrt20 0)
 
-target_link_libraries(msvcrt20
-    ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def
-    wine)
+target_link_libraries(msvcrt20 wine)
 
 add_importlibs(msvcrt20 msvcrt kernel32 ntdll)
-add_dependencies(msvcrt20 msvcrt20_def psdk buildno_header)
+add_dependencies(msvcrt20 psdk buildno_header)
 add_cab_target(msvcrt20 1)
index 29e0426..f3ac72a 100644 (file)
@@ -4,16 +4,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 add_definitions(-DCRTDLL)
 
-spec2def(msvcrt40 ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt40.spec ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
+spec2def(msvcrt40.dll msvcrt40.spec)
 
-add_library(msvcrt40 SHARED msvcrt40.c)
+add_library(msvcrt40 SHARED msvcrt40.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
 
 set_module_type(msvcrt40 win32dll)
 
-target_link_libraries(msvcrt40
-    ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def
-    wine)
+target_link_libraries(msvcrt40 wine)
 
 add_importlibs(msvcrt40 msvcrt kernel32 ntdll)
-add_dependencies(msvcrt40 msvcrt40_def)
+
 add_cab_target(msvcrt40 1)
index 1c2f290..97d55d9 100644 (file)
@@ -4,20 +4,19 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 add_definitions(-D_WINE)
 
-spec2def(msvfw32 ${CMAKE_CURRENT_SOURCE_DIR}/msvfw32.spec ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
+spec2def(msvfw32.dll msvfw32.spec)
 
 add_library(msvfw32 SHARED
     mciwnd.c
     msvideo_main.c
     drawdib.c
-    rsrc.rc)
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
 
 set_module_type(msvfw32 win32dll)
 
-target_link_libraries(msvfw32
-    ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def
-    wine)
+target_link_libraries(msvfw32 wine)
 
 add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll)
-add_dependencies(msvfw32 msvfw32_def)
+
 add_cab_target(msvfw32 1)
index 083ba15..de35dfa 100644 (file)
@@ -4,16 +4,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 add_definitions(-D_WINE)
 
-spec2def(msvidc32 ${CMAKE_CURRENT_SOURCE_DIR}/msvidc32.spec ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
+spec2def(msvidc32.dll msvidc32.spec)
 
-add_library(msvidc32 SHARED msvideo1.c rsrc.rc)
+add_library(msvidc32 SHARED msvideo1.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
 
 set_module_type(msvidc32 win32dll)
 
-target_link_libraries(msvidc32
-    ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def
-    wine)
+target_link_libraries(msvidc32 wine)
 
 add_importlibs(msvidc32 user32 kernel32 ntdll)
-add_dependencies(msvidc32 msvidc32_def)
+
 add_cab_target(msvidc32 1)
index 51ae712..5f664a9 100644 (file)
@@ -4,17 +4,16 @@ set_unicode()
 add_definitions(-DLE)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mswsock ${CMAKE_CURRENT_SOURCE_DIR}/mswsock.spec ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
+spec2def(mswsock.dll mswsock.spec)
 
 add_library(mswsock SHARED
     extensions.c
     stubs.c
-    mswsock.rc)
+    mswsock.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
 
 set_module_type(mswsock win32dll)
 
-target_link_libraries(mswsock ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
-
 add_importlibs(mswsock ws2_32 kernel32)
-add_dependencies(mswsock mswsock_def)
+
 add_cab_target(mswsock 1)
index a0fe51d..30b26b8 100644 (file)
@@ -18,7 +18,7 @@ endif(MSVC)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msxml3 ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.spec ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
+spec2def(msxml3.dll msxml3.spec)
 
 add_library(msxml3 SHARED
     attribute.c
@@ -47,12 +47,12 @@ add_library(msxml3 SHARED
     docfrag.c
     domimpl.c
     entityref.c
-    version.rc)
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
 
 set_module_type(msxml3 win32dll)
 
 target_link_libraries(msxml3
-    ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def
     libxml2
     uuid
     wine
@@ -76,5 +76,5 @@ add_importlibs(msxml3
     kernel32
     ntdll)
 
-add_dependencies(msxml3 msxml3_v1 msxml3_def)
+add_dependencies(msxml3 msxml3_v1)
 add_cab_target(msxml3 1)
index bde7084..2b321fb 100644 (file)
@@ -2,16 +2,15 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(nddeapi ${CMAKE_CURRENT_SOURCE_DIR}/nddeapi.spec ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
+spec2def(nddeapi.dll nddeapi.spec)
 
-add_library(nddeapi SHARED nddeapi.c)
+add_library(nddeapi SHARED nddeapi.c
+    ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
 
 set_entrypoint(nddeapi 0)
 
-target_link_libraries(nddeapi
-    ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def
-    wine)
+target_link_libraries(nddeapi wine)
 
 add_importlibs(nddeapi kernel32 ntdll)
-add_dependencies(nddeapi nddeapi_def psdk buildno_header)
+add_dependencies(nddeapi psdk buildno_header)
 add_cab_target(nddeapi 1)
\ No newline at end of file
index 3dbb368..042b81e 100644 (file)
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(netapi32 ${CMAKE_CURRENT_SOURCE_DIR}/netapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
+spec2def(netapi32.dll netapi32.spec)
 
 add_library(netapi32 SHARED
     access.c
@@ -16,14 +16,13 @@ add_library(netapi32 SHARED
     netapi32.c
     netbios.c
     share.c
-    wksta.c)
+    wksta.c
+    ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
 
 set_module_type(netapi32 win32dll)
 
-target_link_libraries(netapi32
-    ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def
-    wine)
+target_link_libraries(netapi32 wine)
 
 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll)
-add_dependencies(netapi32 netapi32_def)
+
 add_cab_target(netapi32 1)
index f145b73..2edadc8 100644 (file)
@@ -2,7 +2,7 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-spec2def(netcfgx ${CMAKE_CURRENT_SOURCE_DIR}/netcfgx.spec ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def)
+spec2def(netcfgx.dll netcfgx.spec)
 
 add_library(netcfgx SHARED
     netcfgx.c
@@ -10,15 +10,15 @@ add_library(netcfgx SHARED
     netcfg_iface.c
     inetcfgcomp_iface.c
     tcpipconf_notify.c
-    netcfgx.rc)
+    netcfgx.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def)
 
 set_module_type(netcfgx win32dll)
 
 target_link_libraries(netcfgx
-    ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def
     uuid
     wine)
 
 add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 kernel32 ntdll)
-add_dependencies(netcfgx netcfgx_def)
+
 add_cab_target(netcfgx 1)
index bf1109b..e3b4cb4 100644 (file)
@@ -3,16 +3,13 @@ set_unicode()
 
 include_directories(${REACTOS_BINARY_DIR}/include/reactos)
 
-spec2def(netevent ${CMAKE_CURRENT_SOURCE_DIR}/netevent.spec ${CMAKE_CURRENT_BINARY_DIR}/netevent.def)
+spec2def(netevent.dll netevent.spec)
 
-add_library(netevent SHARED netevent.c netevt.rc)
+add_library(netevent SHARED netevent.c netevt.rc ${CMAKE_CURRENT_BINARY_DIR}/netevent.def)
 
 set_module_type(netevent win32dll)
 
-target_link_libraries(netevent
-    ${CMAKE_CURRENT_BINARY_DIR}/netevent.def)
-
 add_importlibs(netevent kernel32)
 
-add_dependencies(netevent netevent_def neteventmsg)
+add_dependencies(netevent neteventmsg)
 add_cab_target(netevent 1)
index 4c8ebca..18adaa5 100644 (file)
@@ -1,13 +1,10 @@
 
-spec2def(netid ${CMAKE_CURRENT_SOURCE_DIR}/netid.spec ${CMAKE_CURRENT_BINARY_DIR}/netid.def)
+spec2def(netid.dll netid.spec)
 
-add_library(netid SHARED netid.c netid.rc)
+add_library(netid SHARED netid.c netid.rc ${CMAKE_CURRENT_BINARY_DIR}/netid.def)
 
 set_module_type(netid win32dll)
 
-target_link_libraries(netid
-    ${CMAKE_CURRENT_BINARY_DIR}/netid.def)
-
 add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 kernel32 ntdll)
-add_dependencies(netid netid_def)
+
 add_cab_target(netid 1)
index 44d0846..e001c3c 100644 (file)
@@ -3,7 +3,7 @@ add_definitions(-D_NETSHELL_)
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-spec2def(netshell ${CMAKE_CURRENT_SOURCE_DIR}/netshell.spec ${CMAKE_CURRENT_BINARY_DIR}/netshell.def)
+spec2def(netshell.dll netshell.spec)
 
 list(APPEND SOURCE
     netshell.c
@@ -13,7 +13,8 @@ list(APPEND SOURCE
     classfactory.c
   &