[CMAKE]

- 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

CMakeMacros.cmake

@@ -41,16 +41,13 @@ MACRO(add_pch _target_name _header_filename _src_list)
 
 ENDMACRO(add_pch _target_name _header_filename _src_list)
 
-MACRO(spec2def _target_name _spec_file _def_file)
-
+MACRO(spec2def _dllname _spec_file)
+    get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
-        OUTPUT ${_def_file}
-        COMMAND native-winebuild -o ${_def_file} --def -E ${_spec_file} --filename ${_target_name}.dll
-        DEPENDS native-winebuild)
-    set_source_files_properties(${_def_file} PROPERTIES GENERATED TRUE)
-    add_custom_target(${_target_name}_def ALL DEPENDS ${_def_file})
-
-ENDMACRO(spec2def _target_name _spec_file _def_file)
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
+ENDMACRO(spec2def _dllname _spec_file)
 
 if (NOT MSVC)
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)

base/applications/kbswitch/kbsdll/CMakeLists.txt

@@ -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)

base/applications/regedit/clb/CMakeLists.txt

@@ -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)
     

dll/3rdparty/dxtn/CMakeLists.txt

@@ -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)

dll/cpl/access/CMakeLists.txt

@@ -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)

dll/cpl/appwiz/CMakeLists.txt

@@ -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)

dll/cpl/console/CMakeLists.txt

@@ -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)

dll/cpl/desk/CMakeLists.txt

@@ -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)

dll/cpl/hdwwiz/CMakeLists.txt

@@ -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)

dll/cpl/input/CMakeLists.txt

@@ -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)

dll/cpl/intl/CMakeLists.txt

@@ -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)

dll/cpl/joy/CMakeLists.txt

@@ -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)

dll/cpl/main/CMakeLists.txt

@@ -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)

dll/cpl/mmsys/CMakeLists.txt

@@ -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)

dll/cpl/ncpa/CMakeLists.txt

@@ -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)

dll/cpl/odbccp32/CMakeLists.txt

@@ -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)

dll/cpl/powercfg/CMakeLists.txt

@@ -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)

dll/cpl/sysdm/CMakeLists.txt

@@ -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)

dll/cpl/telephon/CMakeLists.txt

@@ -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)

dll/cpl/timedate/CMakeLists.txt

@@ -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)

dll/cpl/usrmgr/CMakeLists.txt

@@ -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)

dll/directx/amstream/CMakeLists.txt

@@ -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)

dll/directx/d3d8thk/CMakeLists.txt

@@ -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)

dll/directx/devenum/CMakeLists.txt

@@ -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)

dll/directx/dinput/CMakeLists.txt

@@ -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)

dll/directx/dinput8/CMakeLists.txt

@@ -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)

dll/directx/dmusic/CMakeLists.txt

@@ -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)

dll/directx/dplay/CMakeLists.txt

@@ -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)

dll/directx/dsound/CMakeLists.txt

@@ -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)

dll/directx/dxdiagn/CMakeLists.txt

@@ -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)

dll/directx/ksproxy/CMakeLists.txt

@@ -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)

dll/directx/ksuser/CMakeLists.txt

@@ -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)

dll/directx/msdmo/CMakeLists.txt

@@ -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)

dll/directx/qedit/CMakeLists.txt

@@ -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)

dll/directx/quartz/CMakeLists.txt

@@ -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)

dll/directx/wine/d3d8/CMakeLists.txt

@@ -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)

dll/directx/wine/d3d9/CMakeLists.txt

@@ -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)

dll/keyboard/kbda1/CMakeLists.txt

@@ -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)

dll/keyboard/kbda2/CMakeLists.txt

@@ -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)

dll/keyboard/kbda3/CMakeLists.txt

@@ -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)

dll/keyboard/kbdal/CMakeLists.txt

@@ -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)

dll/keyboard/kbdarme/CMakeLists.txt

@@ -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)

dll/keyboard/kbdarmw/CMakeLists.txt

@@ -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)

dll/keyboard/kbdaze/CMakeLists.txt

@@ -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)

dll/keyboard/kbdazel/CMakeLists.txt

@@ -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)

dll/keyboard/kbdbe/CMakeLists.txt

@@ -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)

dll/keyboard/kbdbga/CMakeLists.txt

@@ -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)

dll/keyboard/kbdbgm/CMakeLists.txt

@@ -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)

dll/keyboard/kbdbgt/CMakeLists.txt

@@ -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)

dll/keyboard/kbdblr/CMakeLists.txt

@@ -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)

dll/keyboard/kbdbr/CMakeLists.txt

@@ -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)

dll/keyboard/kbdbur/CMakeLists.txt

@@ -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)

dll/keyboard/kbdcan/CMakeLists.txt

@@ -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)

dll/keyboard/kbdcr/CMakeLists.txt

@@ -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)

dll/keyboard/kbdcz/CMakeLists.txt

@@ -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)

dll/keyboard/kbdcz1/CMakeLists.txt

@@ -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)

dll/keyboard/kbdda/CMakeLists.txt

@@ -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)

dll/keyboard/kbddv/CMakeLists.txt

@@ -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)

dll/keyboard/kbdes/CMakeLists.txt

@@ -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)

dll/keyboard/kbdest/CMakeLists.txt

@@ -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)

dll/keyboard/kbdfc/CMakeLists.txt

@@ -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)

dll/keyboard/kbdfi/CMakeLists.txt

@@ -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)

dll/keyboard/kbdfr/CMakeLists.txt

@@ -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)

dll/keyboard/kbdgeo/CMakeLists.txt

@@ -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)

dll/keyboard/kbdgerg/CMakeLists.txt

@@ -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)

dll/keyboard/kbdgneo/CMakeLists.txt

@@ -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)

dll/keyboard/kbdgr/CMakeLists.txt

@@ -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)

dll/keyboard/kbdgrist/CMakeLists.txt

@@ -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)

dll/keyboard/kbdhe/CMakeLists.txt

@@ -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)

dll/keyboard/kbdheb/CMakeLists.txt

@@ -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)

dll/keyboard/kbdhu/CMakeLists.txt

@@ -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)

dll/keyboard/kbdic/CMakeLists.txt

@@ -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)

dll/keyboard/kbdinasa/CMakeLists.txt

@@ -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)

dll/keyboard/kbdinben/CMakeLists.txt

@@ -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)

dll/keyboard/kbdindev/CMakeLists.txt

@@ -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)

dll/keyboard/kbdinguj/CMakeLists.txt

@@ -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)

dll/keyboard/kbdinmal/CMakeLists.txt

@@ -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)

dll/keyboard/kbdir/CMakeLists.txt

@@ -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)

dll/keyboard/kbdit/CMakeLists.txt

@@ -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)

dll/keyboard/kbdja/CMakeLists.txt

@@ -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)

dll/keyboard/kbdkaz/CMakeLists.txt

@@ -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)

dll/keyboard/kbdko/CMakeLists.txt

@@ -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)

dll/keyboard/kbdla/CMakeLists.txt

@@ -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)

dll/keyboard/kbdlt1/CMakeLists.txt

@@ -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)

dll/keyboard/kbdlv/CMakeLists.txt

@@ -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)

dll/keyboard/kbdmac/CMakeLists.txt

@@ -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)

dll/keyboard/kbdne/CMakeLists.txt

@@ -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)

dll/keyboard/kbdno/CMakeLists.txt

@@ -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)

dll/keyboard/kbdpl1/CMakeLists.txt

@@ -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)

dll/keyboard/kbdpo/CMakeLists.txt

@@ -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)

dll/keyboard/kbdro/CMakeLists.txt

@@ -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)

dll/keyboard/kbdru/CMakeLists.txt

@@ -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)

dll/keyboard/kbdru1/CMakeLists.txt

@@ -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)

dll/keyboard/kbdsg/CMakeLists.txt

@@ -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)

dll/keyboard/kbdsk/CMakeLists.txt

@@ -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)

dll/keyboard/kbdsk1/CMakeLists.txt

@@ -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)

dll/keyboard/kbdsw/CMakeLists.txt

@@ -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)

dll/keyboard/kbdtat/CMakeLists.txt

@@ -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)

dll/keyboard/kbdth0/CMakeLists.txt

@@ -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)

dll/keyboard/kbdth1/CMakeLists.txt

@@ -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)