diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-09 22:39:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-10 02:08:05 +0100 |
| commit | ca8ac449e3524f895de1e94a3c5d511591031b40 (patch) | |
| tree | df690637e7c82375ec1dc429b496b5677869d520 /postprocess | |
| parent | e7014ca47b9147c925fb99154b55c71c7127e935 (diff) | |
fdo#60491: scp2: always package emboleobj library on non-WNT platforms
(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
DISABLE_ATL on all platforms in configure)
Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/Rdb_services.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b1ff3186ea81..840aaee2e059 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -142,9 +142,12 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(filter headless,$(GUIBASE)), \ vcl/vcl.headless \ ) \ + $(if $(filter-out WNT,$(OS)), \ + embeddedobj/source/msole/emboleobj \ + ) \ $(if $(DISABLE_ATL),, \ - embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows) \ $(if $(filter WNT,$(OS)), \ + embeddedobj/source/msole/emboleobj.windows \ embedserv/util/emser \ extensions/source/ole/oleautobridge \ ) \ |