From 0700d6a1f3524ab79b5114559fb2d15c7ba85112 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 18 Aug 2012 16:17:12 +0200
Subject: fix TDE FTBFS

Change-Id: Icde6310d922a3d5e2822789a23403b9f188efaf4
---
 scp2/InstallModule_ooo.mk            |  2 ++
 scp2/InstallModule_tde.mk            |  1 +
 scp2/source/ooo/file_library_ooo.scp | 21 +++++----------------
 scp2/source/tde/file_tde.scp         |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'scp2')

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ac1429941f1f..7fe17a003836 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -47,6 +47,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_NSPLUGIN \
 	ENABLE_ONLINE_UPDATE \
 	ENABLE_OPENGL \
+	ENABLE_TDE \
+	ENABLE_TDEAB \
 	ENABLE_TELEPATHY \
 	MERGELIBS \
 	SYSTEM_BOOST \
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
index 68b1c959a2ee..e20e390bc6f6 100644
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_InstallModule_use_packages,scp2/tde,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
 	ENABLE_TDE \
+	ENABLE_TDEAB \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index de2c541ab4ec..0fe6495d2467 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -428,27 +428,16 @@ End
 
 #ifdef UNX
 
-#ifdef ENABLE_TDEAB
-File gid_File_Lib_Tdeab_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libtdeab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Tdeab_Drv_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libtdeabdrv1,UNXSUFFIX));
-End
-#endif
-
 #ifdef ENABLE_KAB
 STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
 STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
 #endif
 
+#ifdef ENABLE_TDEAB
+STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
+STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
+#endif
+
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
     LIB_FILE_BODY;
diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp
index b4a7e1daf157..0a767d727f7e 100644
--- a/scp2/source/tde/file_tde.scp
+++ b/scp2/source/tde/file_tde.scp
@@ -25,7 +25,7 @@
 
 #ifdef ENABLE_TDE
 File gid_File_Lib_Tdebe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX));
-- 
cgit v1.2.3