summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Repository.mk37
1 files changed, 21 insertions, 16 deletions
diff --git a/Repository.mk b/Repository.mk
index 75ed5175f089..9d54ecabd638 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 \