[Libreoffice-commits] .: Branch 'feature/gnumake2' - 2 commits - Repository.mk solenv/gbuild

[Norbert Thiebaud]

 Repository.mk                     |    5 +++++
 solenv/gbuild/AllLangResTarget.mk |    5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit baa1a022e2730e704a07d41508222ce615a270a4
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 9 19:28:10 2011 -0600

    add all the sub-directory of the RESLOCATION to search for resource
    
    calc has its images split in sub-directory they need to be added
    as arguments for RSC. the easiest way seems to add -lip=xxx for each
    subdirectory in $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 135cf5f..d68ce23 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -211,14 +211,13 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT
 		mkdir -p $(dir $@) $(OUTDIR)/bin \
 			$(dir $(call gb_ResTarget_get_imagelist_target,$(1))) && \
 		RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \
+		EXTRA_LIP=`find $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) -type d | sed -e "s/^/-lip=/"` && \
 		echo "-r -p \
 			-lg$(LANGUAGE) \
 			-fs=$@ \
+			$${EXTRA_LIP} \
 			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst \
 			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
 			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
 			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
 			-subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
commit 25ffcecfa3bc278d1db0656c83f412614b7357e3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 9 19:24:50 2011 -0600

    add calc related library to the Repository

diff --git a/Repository.mk b/Repository.mk
index 2643471..d77c234 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -44,6 +44,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	cui \
 	drawinglayer \
 	editeng \
+	for \
+	forui \
 	fwe \
 	fwi \
 	fwk \
@@ -56,6 +58,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	qstart_gtk \
 	sax \
 	sb \
+	sc \
+	scui \
 	sfx \
 	sot \
 	svl \
@@ -106,6 +110,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 	hatchwindowfactory \
 	passwordcontainer \
 	productregistration \
+	vbaobj \
 	vbaswobj \
 ))