[PATCH] fdo#60924: autoinstall tde libraries

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3809

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3809/1

fdo#60924: autoinstall tde libraries

Change-Id: Id986bc7f9f09902dfda849bc86f9c48ccb0f30c3
---
M Repository.mk
M scp2/InstallModule_tde.mk
D scp2/source/tde/file_tde.scp
M scp2/source/tde/module_tde.scp
4 files changed, 1 insertion(+), 43 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 18ce81b..a68ed5f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,6 +222,7 @@
 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 @@
     slideshow \
     stringresource \
     syssh \
-    tdebe1 \
     ucpcmis1 \
     ucpext \
     ucpgio1 \
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
index ad7655e..0e5dae6 100644
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -11,15 +11,6 @@
 
 $(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 \
 ))
diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp
deleted file mode 100644
index 945b0de..0000000
--- a/scp2/source/tde/file_tde.scp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************
- * 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 at 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
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 2cadd97..d3ff16b 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/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 @@
     MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
     Styles = ();
     Files = (auto_Tde_Lib_ALL
-#ifdef ENABLE_TDE
-    gid_File_Lib_Tdebe
-#endif // ENABLE_TDE
     );
 End
-#endif
 

-- 
To view, visit https://gerrit.libreoffice.org/3809
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id986bc7f9f09902dfda849bc86f9c48ccb0f30c3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org at gmail.com>