[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/source solenv/gbuild

[Bjoern Michaelsen]

 Repository.mk                        |    4 +++-
 scp2/source/ooo/file_library_ooo.scp |    2 --
 solenv/gbuild/AutoInstallLibs.mk     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3ed5ab5e2a78914a38e349e82c9c1575ca635157
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Feb 15 20:40:28 2013 +0100

    fdo#60924: move libbib to autoinstallation
    
    Change-Id: I41a94def0db257470e08a86078d1f8bda8470c76

diff --git a/Repository.mk b/Repository.mk
index a488a46..fce9b23 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -228,6 +228,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 ))
 endif
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+    bib \
+))
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     abp \
     acc \
@@ -240,7 +243,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     $(if $(filter $(OS),ANDROID),, \
 		basebmp \
     ) \
-    bib \
     canvastools \
     communi \
     date \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2859a32..b55940e 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -66,8 +66,6 @@ End
 
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Bib , bib)
-
 File gid_File_Lib_Cached1
     LIB_FILE_BODY;
     Styles = (PACKED);
commit 87a9d8fdc6bd793f27a4fa62ebac233bd6a27438
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Feb 15 20:34:41 2013 +0100

    handle more than one lib correctly :/
    
    Change-Id: I1c6478e0ed69c7678598eb0d65cd5043d6c8dd99

diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index d1b67f1..f7fa75c 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -18,7 +18,7 @@ $(call gb_AutoInstallLibs_get_target,%) :
 	echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
 	$(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE)))
 	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-		echo "$(call SCP2TEMPLATE,$(lib))" >> $@)
+		echo "$(call SCP2TEMPLATE,$(lib))" >> $@;)
 
 
 $(call gb_AutoInstallLibs_get_clean_target,%) :