diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-23 17:39:22 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-23 17:39:22 +0100 |
| commit | 10c5f3bfd8e5353119055f1c2308c02f3c96cee4 (patch) | |
| tree | 700699868c0f0094a4da447358c6bd8ca092ca9d /xmlhelp | |
| parent | ae5eefb6e65eb318078a28ceb600a246d8b5a9ca (diff) | |
| parent | bd579facad76db083ceab57bc8848f31c4a6d5e5 (diff) | |
merge commit for m65
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index 1e1a2c518f..db6e619b31 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -58,8 +58,6 @@ CFLAGS+=-DSYSTEM_EXPAT JAVACLASSFILES = \ - $(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpIndexerTool.class \ - $(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpFileDocument.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class @@ -75,9 +73,7 @@ TRANSEX3FILES = \ ADDFILES = $(subst,$(SOLARBINDIR)$/help,$(CLASSDIR) $(TRANSEX3FILES)) -#JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -JARFILES = ridl.jar jurt.jar unoil.jar juh.jar HelpIndexerTool.jar +JARFILES = ridl.jar jurt.jar unoil.jar juh.jar .IF "$(SYSTEM_LUCENE)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) COMP=fix_system_lucene @@ -96,6 +92,7 @@ CUSTOMMANIFESTFILE = MANIFEST.MF ALLTAR : $(ADDFILES) .IF "$(JARTARGETN)"!="" +$(JAVATARGET) : $(ADDFILES) $(JARTARGETN) : $(ADDFILES) $(JARTARGETN) : $(COMP) .ENDIF |