summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-02-25 15:43:37 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-02-25 15:55:03 +0100
commit9cc557720fe8951d99b1b60b45ca41372eb4d7e8 (patch)
treedc67adb935e3edba453dcb8dcee45c5fa51fdba4
parent500aa64d6c2a3f413c2ae2de8e3a770f60c245db (diff)
fdo#60924: move frm from scp2 to gbuild
Change-Id: I74232178bb8c8a528d03274fbc8c1c9573874421
-rw-r--r--Repository.mk3
-rw-r--r--scp2/source/ooo/file_library_ooo.scp2
2 files changed, 2 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk
index 0967b627059e..e3a5a6952fd5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -248,9 +248,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbaxml \
drawinglayer \
file \
+ frm \
sdbt \
odbcbase \
))
+
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
acc \
@@ -299,7 +301,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
flash \
flat \
for \
- frm \
fwe \
fwi \
fwk \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5176d3ab3283..c709fa7f9910 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,8 +560,6 @@ End
#endif
-STD_LIB_FILE( gid_File_Lib_Frm , frm)
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
#ifdef WNT