diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-26 19:47:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-26 20:04:45 +0200 |
| commit | 7666c262533415914b08ec3129fbbc52aa2e96e9 (patch) | |
| tree | 4dfed86f00f6f8a694c6e31ddd0a633e7c642c7a /Repository.mk | |
| parent | 3b228541290b6d6b8ef390b941f812abc280d438 (diff) | |
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
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 37 |
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 \ |