diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:51:01 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:51:01 +0000 |
commit | b0893c26a617113a44ed7e913300fcbc5bc37199 (patch) | |
tree | 11db20c7fdfa01a330c9ddf5ba6a66da1cf6186c /ridljar/source | |
parent | fcc45363de1fb84c70724fa32c03d45561a42da7 (diff) |
INTEGRATION: CWS sb33 (1.2.2); FILE MERGED
2005/06/29 12:32:17 sb 1.2.2.1: #i51194# Make sure build works w/o SOLAR_JAVA (patch supplied by kendy).
Diffstat (limited to 'ridljar/source')
-rw-r--r-- | ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk b/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk index 483dc75cb..850bc71a8 100644 --- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk +++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: obo $ $Date: 2005-06-17 09:45:10 $ +# last change: $Author: obo $ $Date: 2005-07-07 10:51:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,6 +81,8 @@ CUSTOMMANIFESTFILE = manifest .INCLUDE: target.mk +.IF "$(SOLAR_JAVA)" != "" + .IF "$(depend)" == "" $(JAVACLASSFILES): $(MISC)$/$(TARGET).mkdir.done .ENDIF @@ -88,3 +90,5 @@ $(JAVACLASSFILES): $(MISC)$/$(TARGET).mkdir.done $(MISC)$/$(TARGET).mkdir.done .ERRREMOVE: $(MKDIR) $(CLASSDIR) $(TOUCH) $@ + +.ENDIF |