scp2: move winexplorerext libs to AutoInstall

Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1

5 files changed, 37 insertions, 66 deletions

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 271d225e1093..bc3e8d847618 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -33,6 +33,10 @@ $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
+$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
+$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk
index 2e9239ee4916..9d64cbfc9a25 100644
--- a/scp2/InstallModule_winexplorerext.mk
+++ b/scp2/InstallModule_winexplorerext.mk
@@ -9,8 +9,12 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/winexplorerext))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\
-	BUILD_X64 \
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
+	winexplorerextbinarytable \
+	winexplorerext \
+	winexplorerextnt6 \
+	winexplorerextwin64 \
+	winexplorerextwin64nt6 \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index ac4de16b7142..bfe9b55422ad 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -172,6 +172,23 @@ End
         ComponentCondition = cond; \
     End
 
+#define SHLXTHDL_LIB_FILE(id,name) \
+    File id \
+        Name = name; \
+        LIB_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir    = gid_Dir_Shlxthdl; \
+    End
+
+#define SHLXTHDL_LIB_FILE_COMPONENTCONDITION(id,name,cond) \
+    File id \
+        Name = name; \
+        LIB_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir    = gid_Dir_Shlxthdl; \
+        ComponentCondition = cond; \
+    End
+
 #ifdef MACOSX
 // links are craeted at configure time by odk/config/setsdkenv_unix.sh.in
 #define SDK_LIBRARY_LINK(id,name,target)
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 65ebc524414f..c7fcd69298cf 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -23,63 +23,6 @@ Directory gid_Dir_Shlxthdl
     DosName = "shlxthdl";
 End
 
-File gid_File_Lib_OOoFilt
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofilt.dll";
-End
-
-#ifdef BUILD_X64
-
-File gid_File_Lib_OOoFilt64
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofilt_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
-#endif
-
-File gid_File_Lib_Shlxthdl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "shlxthdl.dll";
-End
-
-#ifdef BUILD_X64
-    File gid_File_Lib_Shlxthdl64
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "shlxthdl_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
-#endif
-
-File gid_File_Lib_PropertyHdl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "propertyhdl.dll";
-    ComponentCondition = "VersionNT >= 600";
-
-End
-
-#ifdef BUILD_X64
-    File gid_File_Lib_PropertyHdl64
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "propertyhdl_x64.dll";
-    ComponentCondition = "VersionNT64 >= 600";
-End
-
-#endif
-
 #ifdef BUILD_X64
 
 #if defined(WITH_VC100_REDIST)
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index dbed4cfdb2dd..2be352372cea 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -17,7 +17,12 @@
  */
 
 #include "macros.inc"
+
 #include "AutoInstall/winexplorerextbinarytable"
+#include "AutoInstall/winexplorerext"
+#include "AutoInstall/winexplorerextnt6"
+#include "AutoInstall/winexplorerextwin64"
+#include "AutoInstall/winexplorerextwin64nt6"
 
 Module gid_Module_Optional_Winexplorerext
     MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
@@ -26,10 +31,9 @@ Module gid_Module_Optional_Winexplorerext
     Minimal = YES;
     ParentID = gid_Module_Optional;
     Dirs = (gid_Dir_Shlxthdl);
-    Files = (auto_winexplorerextbinarytable_ALL
-             gid_File_Lib_Shlxthdl,
-             gid_File_Lib_OOoFilt,
-             gid_File_Lib_PropertyHdl,
+    Files = (auto_winexplorerextbinarytable_ALL,
+             auto_winexplorerext_ALL,
+             auto_winexplorerextnt6_ALL,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
 End
 
@@ -41,9 +45,8 @@ Module gid_Module_Optional_Winexplorerext_x64
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Dirs = (gid_Dir_Shlxthdl);
-    Files = (gid_File_Lib_Shlxthdl64,
-             gid_File_Lib_OOoFilt64,
-             gid_File_Lib_PropertyHdl64,
+    Files = (auto_winexplorerextwin64_ALL,
+             auto_winexplorerextwin64nt6_ALL,
              gid_File_Lib_Msvcp100,
              gid_File_Lib_Msvcr100,
              gid_File_Lib_Msvcp110,