[SHELL32]

- Move recyclebin static lib in the shell32 folder and name it shellrecyclebin alongside shelldesktop and shellmenu static libs.

svn path=/trunk/; revision=71243

reactos/dll/win32/shell32/CMakeLists.txt

@@ -2,6 +2,7 @@ PROJECT(SHELL)
 
 add_subdirectory(shelldesktop)
 add_subdirectory(shellmenu)
+add_subdirectory(shellrecyclebin)
 
 set_cpp(WITH_RUNTIME)
 spec2def(shell32.dll shell32.spec ADD_IMPORTLIB)
@@ -19,7 +20,6 @@ add_definitions(
     -D_WINE)
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/lib/recyclebin
     ${REACTOS_SOURCE_DIR}/sdk/lib/atl
     ${REACTOS_SOURCE_DIR})
 

reactos/dll/win32/shell32/precomp.h

@@ -20,7 +20,6 @@
 #include <shlwapi.h>
 #include <shlobj.h>
 #include <shobjidl.h>
-#include <recyclebin.h>
 #include <ndk/rtlfuncs.h>
 #include <fmifs/fmifs.h>
 #include <tchar.h>
@@ -41,6 +40,7 @@
 
 #include <shellutils.h>
 
+#include "shellrecyclebin/recyclebin.h"
 #include "wine/pidl.h"
 #include "debughlp.h"
 #include "wine/shell32_main.h"

reactos/dll/win32/shell32/wine/shellord.c

@@ -34,7 +34,7 @@
 #include <shlwapi.h>
 #include <commdlg.h>
 #include <commoncontrols.h>
-#include <recyclebin.h>
+#include "../shellrecyclebin/recyclebin.h"
 
 #include <wine/debug.h>
 #include <wine/unicode.h>

reactos/sdk/lib/CMakeLists.txt

@@ -33,7 +33,6 @@ add_subdirectory(lsalib)
 add_subdirectory(nt)
 add_subdirectory(ppcmmu)
 add_subdirectory(pseh)
-add_subdirectory(recyclebin)
 
 if(KDBG)
     add_subdirectory(rossym)