From 87610049f8a1690598b84b0bf984cfa487ce1074 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Wed, 24 Aug 2011 14:23:13 +0100
Subject: misc cleanups of mergelibs functionality

---
 scp2/source/ooo/file_library_ooo.scp | 2 ++
 scp2/source/ooo/makefile.mk          | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'scp2')

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 975ec1598dbd..b210026f84d4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1292,7 +1292,9 @@ STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
 STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
+#ifdef MERGELIBS
 STD_LIB_FILE( gid_File_Lib_Merged, merged )
+#endif
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0e988b2fa570..7d6aba50c4cd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -72,6 +72,10 @@ SCPDEFS+=-DENABLE_GTK3
 .ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 
+.IF "$(MERGELIBS)" == "TRUE"
+SCPDEFS+=-DMERGELIBS
+.ENDIF
+
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
-- 
cgit