[ros-diffs] [jgardou] 49362: [CMAKE] - leftover from r49358

Author: jgardou
Date: Sat Oct 30 17:05:21 2010
New Revision: 49362

URL: http://svn.reactos.org/svn/reactos?rev=49362&view=rev
Log:
[CMAKE]
  - leftover from r49358

Modified:
    branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt
    branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
    branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt
    branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt
    branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt
    branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt
    branches/cmake-bringup/dll/win32/user32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt
    branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt
    branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C…
==============================================================================
--- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21
2010
@@ -36,7 +36,8 @@
     objects/text.c
     objects/utils.c
     objects/path.c
-    gdi32.rc)
+    gdi32.rc
+    gdi32.def)
 
 add_library(gdi32 SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch
@@ -45,7 +46,6 @@
 set_module_type(gdi32 win32dll)
 
 target_link_libraries(gdi32
-    ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.def
     win32ksys
     dxguid
     pseh)

Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.…
==============================================================================
--- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(hhctrl ${CMAKE_CURRENT_SOURCE_DIR}/hhctrl.ocx.spec
${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def)
+spec2def(hhctrl.ocx hhctrl.ocx.spec)
 
 add_library(hhctrl SHARED
     chm.c
@@ -14,12 +14,12 @@
     search.c
     stream.c
     webbrowser.c
-    hhctrl.rc)
+    hhctrl.rc    
+    ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def)
 
 set_module_type(hhctrl win32ocx)
 
 target_link_libraries(hhctrl
-    ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def
     uuid
     wine)
 

Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3…
==============================================================================
--- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -4,22 +4,16 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/imaadp32.acm.spec --filename imaadp32.acm
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def PROPERTIES
GENERATED TRUE)
-add_custom_target(imaadp32.acm_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def)
+spec2def(imaadp32.acm imaadp32.acm.spec)
 
-add_library(imaadp32.acm SHARED imaadp32.c)
+add_library(imaadp32 SHARED imaadp32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
 
-set_entrypoint(imaadp32.acm 0)
-set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")
+set_entrypoint(imaadp32 0)
+set_target_properties(imaadp32 PROPERTIES SUFFIX "acm")
 
-target_link_libraries(imaadp32.acm
-    ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def
-    wine)
+target_link_libraries(imaadp32 wine)
 
-add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(imaadp32.acm psdk buildno_header)
-add_cab_target(imaadp32.acm 1)
+add_importlibs(imaadp32 winmm user32 msvcrt kernel32 ntdll)
+add_dependencies(imaadp32 psdk buildno_header)
+add_cab_target(imaadp32 1)

Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -93,7 +93,8 @@
     thread/thread.c
     thread/tls.c
     kernel32.rc
-    kernel32_stubs.c)
+    kernel32_stubs.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def)
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE
@@ -111,8 +112,7 @@
 
 set_module_type(kernel32 win32dll)
 
-target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def
-    pseh)
+target_link_libraries(kernel32 pseh)
 
 add_importlibs(kernel32 ntdll)
 add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE})

Modified: branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32…
==============================================================================
--- branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Sat
Oct 30 17:05:21 2010
@@ -3,21 +3,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/msacm32.drv.spec --filename msacm32.drv
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def PROPERTIES
GENERATED TRUE)
-add_custom_target(msacm32.drv_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def)
+spec2def(msacm32.drv msacm32.drv.spec)
 
-add_library(msacm32.drv SHARED wavemap.c wavemap.rc)
+add_library(msacm32.drv SHARED wavemap.c wavemap.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
 
 set_entrypoint(msacm32.drv 0)
 set_target_properties(msacm32.drv PROPERTIES SUFFIX "")
 
-target_link_libraries(msacm32.drv
-    ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def
-    wine)
+target_link_libraries(msacm32.drv wine)
 
 add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll)
 add_dependencies(msacm32.drv psdk buildno_header)

Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32…
==============================================================================
--- branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -4,21 +4,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/msadp32.acm.spec --filename msadp32.acm
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def PROPERTIES
GENERATED TRUE)
-add_custom_target(msadp32.acm_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def)
+spec2def(msadp32.acm msadp32.acm.spec)
 
-add_library(msadp32.acm SHARED msadp32.c)
+add_library(msadp32.acm SHARED msadp32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def)
 
 set_entrypoint(msadp32.acm 0)
 set_target_properties(msadp32.acm PROPERTIES SUFFIX "")
 
-target_link_libraries(msadp32.acm
-    ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def
-    wine)
+target_link_libraries(msadp32.acm wine)
 
 add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll)
 add_dependencies(msadp32.acm psdk buildno_header)

Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.…
==============================================================================
--- branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -4,21 +4,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/msg711.acm.spec --filename msg711.acm
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def PROPERTIES
GENERATED TRUE)
-add_custom_target(msg711.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def)
+spec2def(msg711.acm msg711.acm.spec)
 
-add_library(msg711.acm SHARED msg711.c)
+add_library(msg711.acm SHARED msg711.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msg711.def)
 
 set_entrypoint(msg711.acm 0)
 set_target_properties(msg711.acm PROPERTIES SUFFIX "")
 
-target_link_libraries(msg711.acm
-    ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def
-    wine)
+target_link_libraries(msg711.acm wine)
 
 add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll)
 add_dependencies(msg711.acm psdk buildno_header)

Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32…
==============================================================================
--- branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -4,21 +4,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/msgsm32.acm.spec --filename msgsm32.acm
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def PROPERTIES
GENERATED TRUE)
-add_custom_target(msgsm32.acm_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def)
+spec2def(msgsm32.acm msgsm32.acm.spec)
 
-add_library(msgsm32.acm SHARED msgsm32.c)
+add_library(msgsm32.acm SHARED msgsm32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
 
 set_entrypoint(msgsm32.acm 0)
 set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
 
-target_link_libraries(msgsm32.acm
-    ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def
-    wine)
+target_link_libraries(msgsm32.acm wine)
 
 add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll)
 add_dependencies(msgsm32.acm psdk buildno_header)

Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.…
==============================================================================
--- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -6,19 +6,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/mshtml.tlb.spec --filename mshtml.tlb
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def PROPERTIES
GENERATED TRUE)
-add_custom_target(mshtml.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def)
+spec2def(mshtml.tlb mshtml.tlb.spec)
 
-add_library(mshtml.tlb SHARED rsrc.rc)
+add_library(mshtml.tlb SHARED rsrc.rc
+    ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.def)
 
 set_entrypoint(mshtml.tlb 0)
 set_target_properties(mshtml.tlb PROPERTIES SUFFIX "")
 
-
-
-add_dependencies(mshtml.tlb mshtml_tlb mshtml.tlb_def)
 add_cab_target(mshtml.tlb 1)

Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.…
==============================================================================
--- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -2,14 +2,14 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msisys ${CMAKE_CURRENT_SOURCE_DIR}/msisys.ocx.spec
${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
+spec2def(msisys.ocx msisys.ocx.spec)
 
-add_library(msisys SHARED msisys.c)
+add_library(msisys SHARED msisys.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
 
 set_module_type(msisys win32ocx)
 
 target_link_libraries(msisys
-    ${CMAKE_CURRENT_BINARY_DIR}/msisys.def
     uuid
     wine)
 

Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2…
==============================================================================
--- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -5,19 +5,15 @@
 
 ADD_TYPELIB(std_ole_v2 std_ole_v2.idl)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/stdole2.tlb.spec --filename stdole2.tlb
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def PROPERTIES
GENERATED TRUE)
-add_custom_target(stdole2.tlb_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def)
+spec2def(stdole2.tlb stdole2.tlb.spec)
 
-add_library(stdole2.tlb SHARED rsrc.rc)
+add_library(stdole2.tlb SHARED rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def)
 
 set_entrypoint(stdole2.tlb 0)
 set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
 
 
 
-add_dependencies(stdole2.tlb std_ole_v2 stdole2.tlb_def)
+add_dependencies(stdole2.tlb std_ole_v2)
 add_cab_target(stdole2.tlb 1)

Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3…
==============================================================================
--- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -5,19 +5,13 @@
 
 ADD_TYPELIB(std_ole_v1 std_ole_v1.idl)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/stdole32.tlb.spec --filename stdole32.tlb
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def PROPERTIES
GENERATED TRUE)
-add_custom_target(stdole32.tlb_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def)
+spec2def(stdole32.tlb stdole32.tlb.spec)
 
-add_library(stdole32.tlb SHARED rsrc.rc)
+add_library(stdole32.tlb SHARED rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
 
 set_entrypoint(stdole32.tlb 0)
 set_target_properties(stdole32.tlb PROPERTIES SUFFIX "")
 
-
-
-add_dependencies(stdole32.tlb std_ole_v1 stdole32.tlb_def)
+add_dependencies(stdole32.tlb std_ole_v1)
 add_cab_target(stdole32.tlb 1)

Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/…
==============================================================================
--- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -63,7 +63,8 @@
     windows/window.c
     windows/winpos.c
     user32_stubs.c
-    user32.rc)
+    user32.rc
+    ${CMAKE_CURRENT_SOURCE_DIR}/user32.def)
 
 add_library(user32 SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch
@@ -72,7 +73,6 @@
 set_module_type(user32 win32dll)
 
 target_link_libraries(user32
-    ${CMAKE_CURRENT_SOURCE_DIR}/user32.def
     wine
     win32ksys
     pseh)

Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.…
==============================================================================
--- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -9,25 +9,20 @@
     ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer
     ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
 
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def
-                   COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def
--def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv
-                   DEPENDS native-winebuild)
-
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES
GENERATED TRUE)
-add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def)
+spec2def(wdmaud.drv wdmaud.spec)
 
 add_library(wdmaud.drv SHARED
     wdmaud.c
     mixer.c
     mmixer.c
     legacy.c
-    wdmaud.rc)
+    wdmaud.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def)
 
 set_module_type(wdmaud.drv win32dll)
 set_target_properties(wdmaud.drv PROPERTIES SUFFIX "")
 
 target_link_libraries(wdmaud.drv
-    ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def
     mmebuddy
     libsamplerate
     mmixer)

Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3…
==============================================================================
--- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -5,20 +5,15 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/winemp3.acm.spec --filename winemp3.acm
-    DEPENDS native-winebuild)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def PROPERTIES
GENERATED TRUE)
-add_custom_target(winemp3.acm_def ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def)
+spec2def(winemp3.acm winemp3.acm.spec)
 
-add_library(winemp3.acm SHARED mpegl3.c)
+add_library(winemp3.acm SHARED mpegl3.c
+    ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def)
 
 set_entrypoint(winemp3.acm 0)
 set_target_properties(winemp3.acm PROPERTIES SUFFIX "")
 
 target_link_libraries(winemp3.acm
-    ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def
     mingw_common
     wine
     libmpg123)

Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_…
==============================================================================
--- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -4,7 +4,7 @@
 include_directories(inc)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
 
-spec2def(ws2_32_new ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec
${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def)
+spec2def(ws2_32_new.dll ws2_32.spec)
 
 add_library(ws2_32_new SHARED
     src/addrconv.c
@@ -43,13 +43,12 @@
     src/sputil.c
     src/startup.c
     src/wsautil.c
-    ws2_32.rc)
+    ws2_32.rc
+     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
 
 set_module_type(ws2_32_new win32dll)
 
-target_link_libraries(ws2_32_new
-     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def
-     wine)
+target_link_libraries(ws2_32_new wine)
 
 add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll)
 

Modified: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t…
==============================================================================
--- branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -5,7 +5,7 @@
 add_definitions(-DNDIS40)
 add_definitions(-D_NTDRIVER_)
 
-spec2def(tdi ${CMAKE_CURRENT_SOURCE_DIR}/misc/tdi.spec
${CMAKE_CURRENT_BINARY_DIR}/tdi.def)
+spec2def(tdi.sys misc/tdi.spec)
 
 list(APPEND SOURCE
     cte/string.c
@@ -15,14 +15,14 @@
     tdi/dereg.c
     tdi/handler.c
     tdi/obsolete.c
-    tdi/stubs.c)
+    tdi/stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/tdi.def)
 
 add_library(tdi SHARED ${SOURCE})
 
 set_module_type(tdi kernelmodedriver)
 
 target_link_libraries(tdi
-    ${CMAKE_CURRENT_BINARY_DIR}/tdi.def
     -lntoskrnl
     -lhal)
 

Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sat Oct 30
17:05:21 2010
@@ -26,13 +26,13 @@
     utils.c
     xferpkt.c
     class.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/class.def
 )
 
-spec2def(classpnp ${CMAKE_CURRENT_SOURCE_DIR}/class.spec
${CMAKE_CURRENT_BINARY_DIR}/class.def)
+spec2def(classpnp.sys class.spec)
 
 add_library(classpnp SHARED ${SOURCE})
-target_link_libraries(classpnp ${CMAKE_CURRENT_BINARY_DIR}/class.def pseh libcntpr)
-
+target_link_libraries(classpnp pseh libcntpr)
 
 set_module_type(classpnp kernelmodedriver)