[Libreoffice-commits] core.git: Repository.mk

[Michael Stahl]

 Repository.mk |   37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

New commits:
commit 7666c262533415914b08ec3129fbbc52aa2e96e9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Aug 26 19:47:33 2013 +0200

    Repository.mk: fix some errors in 32848f0a and 3f8c36ca
    
    Various libaries were moved from PLAINLIBS to OOOLIBS but are referenced
    with their full DLL file name in the code, e.g. "inprocserv.dll" and all
    the MSI customactions; move them back to PLAINLIBS.
    (mozbootstrap was also renamed but it shouldn't be a problem).
    
    Change-Id: Ibca8f355f84008a525021a8d5484200a7e73758f

diff --git a/Repository.mk b/Repository.mk
index 75ed517..9d54eca 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -356,21 +356,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	xsltfilter \
 	$(if $(filter $(OS),WNT), \
 		ado \
-		dnd \
-		dtrans \
-		fps \
-		ftransl \
-		$(if $(ENABLE_JAVA),java_uno_accessbridge) \
-		$(if $(DISABLE_ATL),,oleautobridge \
-				inprocserv \
-		) \
-		$(if $(WINDOWS_SDK_HOME),instooofiltmsi \
-			qslnkmsi \
-			reg4allmsdoc \
-			sdqsmsi \
-			sellangmsi \
-			sn_tools \
-		) \
+		$(if $(DISABLE_ATL),,oleautobridge) \
 		smplmail \
 		wininetbe1 \
 		$(if $(filter YES,$(WITH_MOZAB4WIN)), \
@@ -529,7 +515,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	$(if $(ENABLE_JAVA), \
 		$(if $(filter $(OS),MACOSX),,officebean) \
 	) \
-        $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
+	$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
 	package2 \
 	$(if $(DISABLE_SCRIPTING),,scriptframe) \
 	sdbc2 \
@@ -552,6 +538,25 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		macab1 \
 		macabdrv1 \
 	) \
+	$(if $(filter WNT,$(OS)), \
+		dnd \
+		dtrans \
+		fps \
+		ftransl \
+		$(if $(ENABLE_JAVA),java_uno_accessbridge) \
+		$(if $(DISABLE_ATL),,\
+			oleautobridge \
+			inprocserv \
+		) \
+		$(if $(WINDOWS_SDK_HOME),\
+			instooofiltmsi \
+			qslnkmsi \
+			reg4allmsdoc \
+			sdqsmsi \
+			sellangmsi \
+			sn_tools \
+		) \
+	) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	bluez_bluetooth \