diff options
Diffstat (limited to 'cppuhelper/qa/propertysetmixin/makefile.mk')
-rw-r--r-- | cppuhelper/qa/propertysetmixin/makefile.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index 384e2b047883..6f43fc740fb7 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -25,7 +25,7 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" && "$(OS)" != "IOS" nothing .PHONY: .ELSE @@ -41,11 +41,6 @@ my_components = $(TARGET).cpp $(TARGET).java .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .IF "$(OS)" == "WNT" my_file = file:/// .ELSE @@ -99,7 +94,9 @@ $(MISC)/$(TARGET)/javamaker.flag: $(MISC)/$(TARGET)/types.rdb $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -Gc -X$(SOLARBINDIR)/udkapi.rdb $< $(TOUCH) $@ +.IF "$(SOLAR_JAVA)"!="" $(JAVATARGET): $(MISC)/$(TARGET)/javamaker.flag +.ENDIF $(MISC)/$(TARGET)/services.rdb .ERRREMOVE: $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/$(TARGET)/services.input \ |