fdo#60924: autoinstall tde libraries

Change-Id: Id986bc7f9f09902dfda849bc86f9c48ccb0f30c3

Repository.mk

@@ -222,6 +222,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 endif
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
+    $(if $(ENABLE_TDE),tdebe1) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
@@ -627,7 +628,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     slideshow \
     stringresource \
     syssh \
-    tdebe1 \
     ucpcmis1 \
     ucpext \
     ucpgio1 \

scp2/InstallModule_tde.mk

@@ -11,15 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/tde))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
-	ENABLE_TDE \
-	ENABLE_TDEAB \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\
-    scp2/source/tde/file_tde \
-))
-
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/tde,\
     scp2/source/tde/module_tde \
 ))

scp2/source/tde/file_tde.scp

-/*************************************************************************
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#ifdef ENABLE_TDE
-STD_LIB_FILE( gid_File_Lib_Tdebe, tdebe1 )
-#endif

scp2/source/tde/module_tde.scp

@@ -26,7 +26,6 @@
 
 #include "AutoInstallLibs/tde"
 
-#if defined( ENABLE_TDE )
 Module gid_Module_Optional_Tde
     ParentID = gid_Module_Optional;
     Default = YES;
@@ -34,10 +33,6 @@ Module gid_Module_Optional_Tde
     MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
     Styles = ();
     Files = (auto_Tde_Lib_ALL
-#ifdef ENABLE_TDE
-    gid_File_Lib_Tdebe
-#endif // ENABLE_TDE
     );
 End
-#endif