diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:29:28 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:29:28 +0000 |
| commit | c7e5101fc5853783af7dcd7ad700a533ffbe609f (patch) | |
| tree | 4c234b3285d6c7a2b272c6c8b06b38f146c13b7d /xmlhelp | |
| parent | ee21aeb44b85f8434734555c5748209a64cc1e8c (diff) | |
INTEGRATION: CWS gcj1 (1.18.12); FILE MERGED
2005/01/10 11:32:38 cmc 1.18.12.1: #i38188# need an alternative that keeps java and gcj happy
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index 17d7b01438b2..b4326d680468 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: kz $ $Date: 2004-08-30 17:26:25 $ +#* last change $Author: obo $ $Date: 2005-01-25 15:29:28 $ #* -#* $Revision: 1.18 $ +#* $Revision: 1.19 $ #* #* $Logfile:$ #* @@ -44,7 +44,6 @@ JAVACLASSFILES = \ $(CLASSDIR)$/$(PACKAGE)$/HelpDatabases.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpURLStreamHandlerFactory.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpURLStreamHandler.class \ - $(CLASSDIR)$/$(PACKAGE)$/FileURLStreamHandlerWithNotify.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpURLStreamHandlerWithJars.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpURLConnection.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpURLConnectionWithJars.class \ @@ -62,6 +61,14 @@ JAVACLASSFILES = \ $(CLASSDIR)$/$(PACKAGE)$/XSLData.class \ $(CLASSDIR)$/$(PACKAGE)$/StringDbt.class +.IF "$(JDK)"=="gcj" +JAVACLASSFILES += \ + $(CLASSDIR)$/$(PACKAGE)$/GCJFileURLStreamHandlerWithNotify.class +.ELSE +JAVACLASSFILES += \ + $(CLASSDIR)$/$(PACKAGE)$/FileURLStreamHandlerWithNotify.class +.ENDIF + JARCLASSDIRS = com JARTARGET = $(PRJNAME).jar JARCOMPRESS = TRUE |