[CMAKE]

* Simplify the way we handle importlib targets by taking control of the importlib name.

svn path=/trunk/; revision=55764

Author: AmineKhaldi

reactos/base/shell/explorer/notifyhook/CMakeLists.txt

@@ -13,5 +13,5 @@ add_library(notifyhook SHARED ${SOURCE})
 set_module_type(notifyhook win32dll)
 
 add_importlibs(notifyhook user32 msvcrt kernel32)
-add_importlib_target(notifyhook.spec)
+add_importlib_target(notifyhook.spec notifyhook.dll)
 add_cd_file(TARGET notifyhook DESTINATION reactos/system32 FOR all)

reactos/cmake/gcc.cmake

@@ -192,33 +192,24 @@ if(NOT ARCH MATCHES i386)
     set(DECO_OPTION "-@")
 endif()
 
-function(add_importlib_target _exports_file)
+function(add_importlib_target _exports_file _implib_name)
 
     get_filename_component(_name ${_exports_file} NAME_WE)
     get_filename_component(_extension ${_exports_file} EXT)
-    get_target_property(_suffix ${_name} SUFFIX)
-    if(${_suffix} STREQUAL "_suffix-NOTFOUND")
-        get_target_property(_type ${_name} TYPE)
-        if(${_type} MATCHES EXECUTABLE)
-            set(_suffix ".exe")
-        else()
-            set(_suffix ".dll")
-        endif()
-    endif()
 
     if(${_extension} STREQUAL ".spec")
 
         # Normal importlib creation
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+            COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
             COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)
 
         # Delayed importlib creation
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
-            COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+            COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
             COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)
 

reactos/cmake/msvc.cmake

@@ -132,22 +132,14 @@ function(set_rc_compiler)
 endfunction()
 
 # Thanks MS for creating a stupid linker
-function(add_importlib_target _exports_file)
+function(add_importlib_target _exports_file _implib_name)
+
     get_filename_component(_name ${_exports_file} NAME_WE)
-    get_target_property(_suffix ${_name} SUFFIX)
-    if(${_suffix} STREQUAL "_suffix-NOTFOUND")
-        get_target_property(_type ${_name} TYPE)
-        if(${_type} MATCHES EXECUTABLE)
-            set(_suffix ".exe")
-        else()
-            set(_suffix ".dll")
-        endif()
-    endif()
 
     # Generate the asm stub file and the export def file
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
-        COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+        COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)
 
     # Assemble the stub file

reactos/dll/directx/dinput/CMakeLists.txt

@@ -37,4 +37,4 @@ add_importlibs(dinput
     ntdll)
 
 add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all)
-add_importlib_target(dinput.spec)
+add_importlib_target(dinput.spec dinput.dll)

reactos/dll/directx/dinput8/CMakeLists.txt

@@ -32,4 +32,4 @@ add_importlibs(dinput8
 add_dependencies(dinput8 psdk)
 
 add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all)
-add_importlib_target(dinput8.spec)
+add_importlib_target(dinput8.spec dinput8.dll)

reactos/dll/directx/dplay/CMakeLists.txt

@@ -27,4 +27,4 @@ add_importlibs(dplay
 add_dependencies(dplay psdk)
 
 add_cd_file(TARGET dplay DESTINATION reactos/system32 FOR all)
-add_importlib_target(dplay.spec libdplayx)
+add_importlib_target(dplay.spec dplay.dll libdplayx)

reactos/dll/directx/dplayx/CMakeLists.txt

@@ -37,4 +37,4 @@ add_importlibs(dplayx
     ntdll)
 
 add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all)
-add_importlib_target(dplayx.spec)
+add_importlib_target(dplayx.spec dplayx.dll)

reactos/dll/directx/dsound/CMakeLists.txt

@@ -39,4 +39,4 @@ add_importlibs(dsound
     ntdll)
 
 add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all)
-add_importlib_target(dsound.spec)
+add_importlib_target(dsound.spec dsound.dll)

reactos/dll/directx/ksuser/CMakeLists.txt

@@ -8,4 +8,4 @@ set_module_type(ksuser win32dll)
 add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll)
 add_dependencies(ksuser psdk bugcodes)
 add_cd_file(TARGET ksuser DESTINATION reactos/system32 FOR all)
-add_importlib_target(ksuser.spec)
+add_importlib_target(ksuser.spec ksuser.dll)

reactos/dll/directx/wine/d3d9/CMakeLists.txt

@@ -47,4 +47,4 @@ add_importlibs(d3d9
 add_dependencies(d3d9 wineheaders)
 add_pch(d3d9 d3d9_private.h)
 add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all)
-add_importlib_target(d3d9.spec)
+add_importlib_target(d3d9.spec d3d9.dll)

reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt

@@ -30,4 +30,4 @@ add_importlibs(d3dx9_24
 
 add_dependencies(d3dx9_24 wineheaders)
 add_cd_file(TARGET d3dx9_24 DESTINATION reactos/system32 FOR all)
-add_importlib_target(d3dx9_24.spec libd3dx9_36)
+add_importlib_target(d3dx9_24.spec d3dx9_24.dll libd3dx9_36)

reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt

@@ -31,4 +31,4 @@ add_importlibs(d3dx9_25
 
 add_dependencies(d3dx9_25 wineheaders)
 add_cd_file(TARGET d3dx9_25 DESTINATION reactos/system32 FOR all)
-add_importlib_target(d3dx9_25.spec libd3dx9_24 libd3dx9_36)
+add_importlib_target(d3dx9_25.spec d3dx9_25.dll libd3dx9_24 libd3dx9_36)

reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt

@@ -23,9 +23,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_library(d3dx9_36 SHARED ${SOURCE})
 set_module_type(d3dx9_36 win32dll)
-
-target_link_libraries(d3dx9_36
-    wine)
+target_link_libraries(d3dx9_36 wine)
 
 add_importlibs(d3dx9_36
     d3d9
@@ -38,4 +36,4 @@ add_importlibs(d3dx9_36
 
 add_dependencies(d3dx9_36 wineheaders)
 add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all)
-add_importlib_target(d3dx9_36.spec)
+add_importlib_target(d3dx9_36.spec d3dx9_36.dll)

reactos/dll/directx/wine/ddraw/CMakeLists.txt

@@ -54,4 +54,4 @@ add_importlibs(ddraw
 add_dependencies(ddraw wineheaders)
 add_pch(ddraw ddraw_private.h)
 add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)
-add_importlib_target(ddraw.spec)
+add_importlib_target(ddraw.spec ddraw.dll)

reactos/dll/directx/wine/wined3d/CMakeLists.txt

@@ -69,7 +69,7 @@ add_importlibs(wined3d
 add_dependencies(wined3d wineheaders)
 add_pch(wined3d wined3d_private.h)
 add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)
-add_importlib_target(wined3d.spec)
+add_importlib_target(wined3d.spec wined3d.dll)
 
 if(NOT MSVC)
     allow_warnings(wined3d)

reactos/dll/ntdll/CMakeLists.txt

@@ -52,4 +52,4 @@ add_pch(ntdll include/ntdll.h)
 add_dependencies(ntdll ntstatus asm)
 
 add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all)
-add_importlib_target(def/ntdll.spec)
+add_importlib_target(def/ntdll.spec ntdll.dll)

reactos/dll/win32/acledit/CMakeLists.txt

@@ -14,4 +14,4 @@ set_module_type(acledit win32dll UNICODE)
 add_importlibs(acledit msvcrt kernel32 ntdll)
 add_pch(acledit acleditint.h)
 add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all)
-add_importlib_target(acledit.spec)
+add_importlib_target(acledit.spec acledit.dll)

reactos/dll/win32/aclui/CMakeLists.txt

@@ -16,7 +16,7 @@ list(APPEND SOURCE
 add_library(aclui SHARED ${SOURCE})
 allow_warnings(aclui)
 set_module_type(aclui win32dll UNICODE)
-add_importlib_target(aclui.spec)
+add_importlib_target(aclui.spec aclui.dll)
 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
 add_pch(aclui precomp.h)
 add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all)

reactos/dll/win32/advapi32/CMakeLists.txt

@@ -65,4 +65,4 @@ add_pch(advapi32 advapi32.h
     ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h)
 
 add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(advapi32.spec)
+add_importlib_target(advapi32.spec advapi32.dll)

reactos/dll/win32/atl/CMakeLists.txt

@@ -37,7 +37,7 @@ add_importlibs(atl
     kernel32
     ntdll)
 
-add_importlib_target(atl.spec)
+add_importlib_target(atl.spec atl.dll)
 
 add_dependencies(atl atl_atliface_header)
 add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all)

reactos/dll/win32/avicap32/CMakeLists.txt

@@ -14,4 +14,4 @@ target_link_libraries(avicap32 wine)
 add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll)
 
 add_cd_file(TARGET avicap32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(avicap32.spec)
+add_importlib_target(avicap32.spec avicap32.dll)

reactos/dll/win32/avifil32/CMakeLists.txt

@@ -40,5 +40,5 @@ add_importlibs(avifil32
     kernel32
     ntdll)
 
-add_importlib_target(avifil32.spec)
+add_importlib_target(avifil32.spec avifil32.dll)
 add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all)

reactos/dll/win32/batt/CMakeLists.txt

@@ -10,7 +10,7 @@ add_library(batt SHARED
 
 set_module_type(batt win32dll UNICODE)
 
-add_importlib_target(batt.spec)
+add_importlib_target(batt.spec batt.dll)
 
 add_importlibs(batt msvcrt kernel32 ntdll)
 

reactos/dll/win32/beepmidi/CMakeLists.txt

@@ -10,7 +10,7 @@ add_library(beepmidi SHARED ${SOURCE})
 set_module_type(beepmidi win32dll ENTRYPOINT 0 UNICODE)
 
 add_importlibs(beepmidi winmm kernel32 ntdll msvcrt)
-add_importlib_target(beepmidi.spec)
+add_importlib_target(beepmidi.spec beepmidi.dll)
 
 add_dependencies(beepmidi psdk)
 add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all)

reactos/dll/win32/cabinet/CMakeLists.txt

@@ -22,7 +22,7 @@ add_library(cabinet SHARED ${SOURCE})
 set_module_type(cabinet win32dll ENTRYPOINT 0)
 target_link_libraries(cabinet wine zlib)
 add_importlibs(cabinet msvcrt kernel32 ntdll)
-add_importlib_target(cabinet.spec)
+add_importlib_target(cabinet.spec cabinet.dll)
 add_pch(cabinet cabinet.h)
 add_dependencies(cabinet psdk)
 add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)

reactos/dll/win32/cards/CMakeLists.txt

@@ -16,5 +16,5 @@ add_library(cards SHARED ${SOURCE})
 
 set_module_type(cards win32dll UNICODE)
 add_importlibs(cards user32 gdi32 msvcrt kernel32)
-add_importlib_target(cards.spec)
+add_importlib_target(cards.spec cards.dll)
 add_cd_file(TARGET cards DESTINATION reactos/system32 FOR all)

reactos/dll/win32/comctl32/CMakeLists.txt

@@ -69,4 +69,4 @@ add_importlibs(comctl32
 
 add_pch(comctl32 comctl32.h)
 add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(comctl32.spec)
+add_importlib_target(comctl32.spec comctl32.dll)

reactos/dll/win32/comdlg32/CMakeLists.txt

@@ -41,4 +41,4 @@ add_importlibs(comdlg32
     ntdll)
 
 add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(comdlg32.spec)
+add_importlib_target(comdlg32.spec comdlg32.dll)

reactos/dll/win32/compstui/CMakeLists.txt

@@ -17,4 +17,4 @@ target_link_libraries(compstui wine)
 
 add_importlibs(compstui msvcrt kernel32 ntdll)
 add_cd_file(TARGET compstui DESTINATION reactos/system32 FOR all)
-add_importlib_target(compstui.spec)
+add_importlib_target(compstui.spec compstui.dll)

reactos/dll/win32/credui/CMakeLists.txt

@@ -20,5 +20,5 @@ set_module_type(credui win32dll)
 target_link_libraries(credui wine)
 
 add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
-add_importlib_target(credui.spec)
+add_importlib_target(credui.spec credui.dll)
 add_cd_file(TARGET credui DESTINATION reactos/system32 FOR all)

reactos/dll/win32/crypt32/CMakeLists.txt

@@ -42,16 +42,9 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
 
 add_library(crypt32 SHARED ${SOURCE})
-
 allow_warnings(crypt32)
-
 set_module_type(crypt32 win32dll)
-
-target_link_libraries(crypt32
-    wine
-    ${PSEH_LIB}
-    oldnames)
-
+target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(crypt32.spec)
+add_importlib_target(crypt32.spec crypt32.dll)

reactos/dll/win32/cryptnet/CMakeLists.txt

@@ -13,12 +13,6 @@ add_library(cryptnet SHARED ${SOURCE})
 set_module_type(cryptnet win32dll)
 target_link_libraries(cryptnet wine)
 add_delay_importlibs(cryptnet wininet)
-
-add_importlibs(cryptnet
-    crypt32
-    msvcrt
-    kernel32
-    ntdll)
-
-add_importlib_target(cryptnet.spec)
+add_importlibs(cryptnet crypt32 msvcrt kernel32 ntdll)
+add_importlib_target(cryptnet.spec cryptnet.dll)
 add_cd_file(TARGET cryptnet DESTINATION reactos/system32 FOR all)

reactos/dll/win32/cryptui/CMakeLists.txt

@@ -32,5 +32,5 @@ add_importlibs(cryptui
     kernel32
     ntdll)
 
-add_importlib_target(cryptui.spec)
+add_importlib_target(cryptui.spec cryptui.dll)
 add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all)

reactos/dll/win32/dbghelp/CMakeLists.txt

@@ -51,5 +51,5 @@ target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames)
 add_delay_importlibs(dbghelp version)
 add_importlibs(dbghelp psapi msvcrt kernel32 ntdll)
 add_pch(dbghelp dbghelp_private.h)
-add_importlib_target(dbghelp.spec)
+add_importlib_target(dbghelp.spec dbghelp.dll)
 add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all)

reactos/dll/win32/devmgr/CMakeLists.txt

@@ -31,4 +31,4 @@ add_importlibs(devmgr
 add_pch(devmgr precomp.h)
 
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
-add_importlib_target(devmgr.spec)
+add_importlib_target(devmgr.spec devmgr.dll)

reactos/dll/win32/dhcpcsvc/CMakeLists.txt

@@ -28,7 +28,7 @@ add_library(dhcpcsvc SHARED ${SOURCE})
 set_module_type(dhcpcsvc win32dll)
 
 add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
-add_importlib_target(dhcpcsvc.spec)
+add_importlib_target(dhcpcsvc.spec dhcpcsvc.dll)
 
 add_pch(dhcpcsvc include/rosdhcp.h)
 

reactos/dll/win32/dnsapi/CMakeLists.txt

@@ -27,4 +27,4 @@ add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
 add_pch(dnsapi dnsapi/precomp.h)
 add_dependencies(dnsapi psdk)
 add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all)
-add_importlib_target(dnsapi.spec)
+add_importlib_target(dnsapi.spec dnsapi.dll)

reactos/dll/win32/fmifs/CMakeLists.txt

@@ -20,4 +20,4 @@ add_importlibs(fmifs kernel32 ntdll)
 add_pch(fmifs precomp.h)
 add_dependencies(fmifs psdk)
 add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all)
-add_importlib_target(fmifs.spec)
+add_importlib_target(fmifs.spec fmifs.dll)

reactos/dll/win32/gdi32/CMakeLists.txt

@@ -56,4 +56,4 @@ target_link_libraries(gdi32
 add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll)
 add_pch(gdi32 include/precomp.h)
 add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(gdi32.spec)
+add_importlib_target(gdi32.spec gdi32.dll)

reactos/dll/win32/gdiplus/CMakeLists.txt

@@ -47,7 +47,7 @@ add_importlibs(gdiplus
     kernel32
     ntdll)
 
-add_importlib_target(gdiplus.spec)
+add_importlib_target(gdiplus.spec gdiplus.dll)
 
 if(ARCH MATCHES amd64)
     target_link_libraries(gdiplus crt)

reactos/dll/win32/getuname/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(getuname SHARED
     getuname.rc
     ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
 
-add_importlib_target(getuname.spec)
+add_importlib_target(getuname.spec getuname.dll)
 set_module_type(getuname win32dll UNICODE)
 add_importlibs(getuname msvcrt kernel32 ntdll)
 add_cd_file(TARGET getuname DESTINATION reactos/system32 FOR all)

reactos/dll/win32/glu32/CMakeLists.txt

@@ -122,4 +122,4 @@ add_importlibs(glu32
     ntdll)
 
 add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(glu32.spec)
+add_importlib_target(glu32.spec glu32.dll)

reactos/dll/win32/hlink/CMakeLists.txt

@@ -28,5 +28,5 @@ add_importlibs(hlink
     ntdll)
 
 add_pch(hlink hlink_private.h)
-add_importlib_target(hlink.spec)
+add_importlib_target(hlink.spec hlink.dll)
 add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all)

reactos/dll/win32/icmp/CMakeLists.txt

@@ -17,5 +17,5 @@ set_module_type(icmp win32dll)
 
 target_link_libraries(icmp wine)
 add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll)
-add_importlib_target(icmp.spec)
+add_importlib_target(icmp.spec icmp.dll)
 add_cd_file(TARGET icmp DESTINATION reactos/system32 FOR all)

reactos/dll/win32/imagehlp/CMakeLists.txt

@@ -18,6 +18,6 @@ add_library(imagehlp SHARED ${SOURCE})
 set_module_type(imagehlp win32dll)
 target_link_libraries(imagehlp wine)
 add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
-add_importlib_target(imagehlp.spec)
+add_importlib_target(imagehlp.spec imagehlp.dll)
 add_pch(imagehlp precomp.h)
 add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all)

reactos/dll/win32/imm32/CMakeLists.txt

@@ -26,4 +26,4 @@ set_module_type(imm32 win32dll)
 target_link_libraries(imm32 wine)
 add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all)
-add_importlib_target(imm32.spec)
+add_importlib_target(imm32.spec imm32.dll)