diff options
| author | sb <sb@openoffice.org> | 2009-11-24 08:33:50 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-11-24 08:33:50 +0100 |
| commit | f6695730459bbd0123012a52efec1c2b2b716daa (patch) | |
| tree | 73e4bac05e0a169c537b7b04fdfd7ae59220e199 /xmlhelp/source | |
| parent | 8f48a583e09dee3b0e1eb202c161ad978efb70b3 (diff) | |
| parent | b4083630cb439a9f54340db6840e8bc6cfcc42c8 (diff) | |
sb111: merged in DEV300_m65
Diffstat (limited to 'xmlhelp/source')
| -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 1e1a2c518fa0..db6e619b31e3 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 |