diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-29 13:18:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-30 08:37:12 +0300 |
| commit | 677defb67bd3bfc861ea31620fadbb4bff65a06e (patch) | |
| tree | 86e7b446307f8a67ba993e479adede021ca41081 | |
| parent | e20fa170160e1bb1953ad171e092edfb3de531af (diff) | |
Don't build and deliver .component files with empty URIs (for iOS)
| -rw-r--r-- | io/source/acceptor/makefile.mk | 15 | ||||
| -rw-r--r-- | io/source/connector/makefile.mk | 11 | ||||
| -rw-r--r-- | ure/Rdb_ure.mk | 5 |
3 files changed, 19 insertions, 12 deletions
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index 40d6c023bf38..566c2b5ca51d 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -68,17 +68,20 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.ENDIF +.ENDIF # IOS -.INCLUDE : target.mk +.ENDIF # L10N_framework -ALLTAR : $(MISC)/acceptor.component +.IF "$(OS)" != "IOS" $(MISC)/acceptor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ acceptor.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt acceptor.component + +ALLTAR : $(MISC)/acceptor.component + +.ENDIF # IOS + +.INCLUDE : target.mk diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk index a4844304d031..2470b614eb35 100644 --- a/io/source/connector/makefile.mk +++ b/io/source/connector/makefile.mk @@ -68,12 +68,11 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework +.ENDIF # IOS -.ENDIF +.ENDIF # L10N_framework -.INCLUDE : target.mk +.IF "$(OS)" != "IOS" ALLTAR : $(MISC)/connector.component @@ -82,3 +81,7 @@ $(MISC)/connector.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt connector.component + +.ENDIF # IOS + +.INCLUDE : target.mk diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index a0639c1c4aa3..464c747eb8c2 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,\ - acceptor \ + $(if $(filter IOS,$(OS)),, \ + acceptor \ + connector) \ binaryurp/source/binaryurp \ bootstrap \ - connector \ introspection \ invocadapt \ invocation \ |