diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-01 11:55:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-01 12:21:00 +0200 |
| commit | 59c0f8f452a538308a9d4098cdc8319b884c3c81 (patch) | |
| tree | 6272bb19d30661acdc9995f8a18ce11e9f2fe6b0 /ure/Rdb_ure.mk | |
| parent | b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0 (diff) | |
| parent | 464a3a271cd4b97573e87d15a38b3f4cad727daf (diff) | |
merge origin/master
Diffstat (limited to 'ure/Rdb_ure.mk')
| -rw-r--r-- | ure/Rdb_ure.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index 5566d4a2012d..3b952318998e 100644 --- a/ure/Rdb_ure.mk +++ b/ure/Rdb_ure.mk @@ -28,10 +28,11 @@ $(eval $(call gb_Rdb_Rdb,ure/services)) $(eval $(call gb_Rdb_add_components,ure/services,\ - io/source/acceptor/acceptor \ + $(if $(filter IOS,$(OS)),, \ + io/source/acceptor/acceptor \ + io/source/connector/connector) \ binaryurp/source/binaryurp \ stoc/util/bootstrap \ - io/source/connector/connector \ stoc/source/inspect/introspection \ stoc/source/invocation_adapterfactory/invocadapt \ stoc/source/invocation/invocation \ @@ -47,9 +48,9 @@ $(eval $(call gb_Rdb_add_components,ure/services,\ ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Rdb_add_components,ure/services,\ + javaunohelper/util/juh \ stoc/source/javaloader/javaloader \ stoc/source/javavm/javavm \ - juh \ )) endif |