From 237d6eab1a1e4f0458f983268fc71606ebbeb623 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 24 Dec 2010 16:12:23 +0000
Subject: [PATCH] [CMAKE] - Improve some modules.

svn path=/branches/cmake-bringup/; revision=50126
---
 base/services/rpcss/CMakeLists.txt    |  2 --
 dll/win32/actxprxy/CMakeLists.txt     | 11 ++++++-----
 dll/win32/oleaut32/CMakeLists.txt     |  1 -
 dll/win32/pstorec/CMakeLists.txt      |  2 +-
 dll/win32/stdole2.tlb/CMakeLists.txt  |  5 ++++-
 dll/win32/stdole32.tlb/CMakeLists.txt |  4 +++-
 dll/win32/sti/CMakeLists.txt          | 11 +++++------
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt
index 6414a97b87a..214db300ffd 100644
--- a/base/services/rpcss/CMakeLists.txt
+++ b/base/services/rpcss/CMakeLists.txt
@@ -6,8 +6,6 @@ list(APPEND SOURCE
     irotp.c
     rpcss_main.c
     service_main.c
-    epm.idl
-    irot.idl
     rpcss.rc)
 
 include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt
index 55083180dee..1a74a0c4d81 100644
--- a/dll/win32/actxprxy/CMakeLists.txt
+++ b/dll/win32/actxprxy/CMakeLists.txt
@@ -1,13 +1,14 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(actxprxy SHARED usrmarshal.c actxprxy.def)
+spec2def(actxprxy.dll actxprxy.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(actxprxy.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    usrmarshal.c
+    ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
+
+add_library(actxprxy SHARED ${SOURCE})
 
 set_entrypoint(actxprxy 0)
 
diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 174f29317b3..44300e5358b 100644
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -19,7 +19,6 @@ list(APPEND SOURCE
     variant.c
     vartype.c
     oleaut32.rc
-    oleaut32_oaidl.idl
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
diff --git a/dll/win32/pstorec/CMakeLists.txt b/dll/win32/pstorec/CMakeLists.txt
index 053baa5549b..b3b7a46dfc1 100644
--- a/dll/win32/pstorec/CMakeLists.txt
+++ b/dll/win32/pstorec/CMakeLists.txt
@@ -17,5 +17,5 @@ add_library(pstorec SHARED ${SOURCE})
 set_module_type(pstorec win32dll)
 target_link_libraries(pstorec uuid wine)
 add_importlibs(pstorec msvcrt kernel32 ntdll)
-add_dependencies(pstorec pstorec_tlb pstorec_def)
+add_dependencies(pstorec pstorec_tlb)
 add_cab_target(pstorec 1)
diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt
index 8487cceeedd..2c32ce8df82 100644
--- a/dll/win32/stdole2.tlb/CMakeLists.txt
+++ b/dll/win32/stdole2.tlb/CMakeLists.txt
@@ -6,9 +6,12 @@ add_typelib(std_ole_v2 std_ole_v2.idl)
 
 spec2def(stdole2.tlb stdole2.tlb.spec)
 
-add_library(stdole2.tlb SHARED rsrc.rc
+list(APPEND SOURCE
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def)
 
+add_library(stdole2.tlb SHARED ${SOURCE})
+
 set_entrypoint(stdole2.tlb 0)
 set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
 add_dependencies(stdole2.tlb std_ole_v2)
diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt
index 01a2b595d33..72d75bdbb94 100644
--- a/dll/win32/stdole32.tlb/CMakeLists.txt
+++ b/dll/win32/stdole32.tlb/CMakeLists.txt
@@ -6,10 +6,12 @@ add_typelib(std_ole_v1 std_ole_v1.idl)
 
 spec2def(stdole32.tlb stdole32.tlb.spec)
 
-add_library(stdole32.tlb SHARED
+list(APPEND SOURCE
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
 
+add_library(stdole32.tlb SHARED ${SOURCE})
+
 set_entrypoint(stdole32.tlb 0)
 set_target_properties(stdole32.tlb PROPERTIES SUFFIX "")
 
diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt
index 68a351c51bd..30d4882496a 100644
--- a/dll/win32/sti/CMakeLists.txt
+++ b/dll/win32/sti/CMakeLists.txt
@@ -10,16 +10,15 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(sti SHARED
+spec2def(sti.dll sti.spec)
+
+list(APPEND SOURCE
     regsvr.c
     sti.c
     sti_main.c
-    sti_wia.idl
-    sti.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
 
-if(NOT MSVC)
-    set_source_files_properties(sti.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(sti SHARED ${SOURCE})
 
 set_entrypoint(sti 0)