Attachment #10819 for issue #21937

View | Details | Raw Unified | Return to issue 21937
Collapse All | Expand All

Lines 67-72 Link Here

(-)source/makefile.mk (+6 lines)
67		67
68	.INCLUDE: settings.mk	68	.INCLUDE: settings.mk
69		69
		70	.IF "$(SOLAR_JAVA)"==""
		71	nojava:
		72	@echo "Not building jvmaccess because Java is disabled"
		73	.ENDIF
		74
70	UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface	75	UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface
71		76
72	UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb	77	UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb
Lines 81-83 Link Here
81	$(SLO)$/windows.obj	86	$(SLO)$/windows.obj
82		87
83	.INCLUDE: target.mk	88	.INCLUDE: target.mk
		89

Lines 71-76 Link Here

(-)util/makefile.mk (+6 lines)
71		71
72	.INCLUDE: settings.mk	72	.INCLUDE: settings.mk
73		73
		74	.IF "$(SOLAR_JAVA)"==""
		75	nojava:
		76	@echo "Not building jvmaccess because Java is disabled"
		77	.ENDIF
		78
		79
74	.IF "$(UNIXVERSIONNAMES)" == ""	80	.IF "$(UNIXVERSIONNAMES)" == ""
75	SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)	81	SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
76	.ELSE # UNIXVERSIONNAMES	82	.ELSE # UNIXVERSIONNAMES

Return to issue 21937