diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-11-24 13:00:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-11-24 13:00:13 +0000 |
| commit | ffd903ad592ccc69c180ef2dd2117f6c69705d6e (patch) | |
| tree | 5ddd7cd0df78db6e0c9caa974cfe95857c36660a /transex3 | |
| parent | de0356c665eb3fc168c4e8a168e3828d50992220 (diff) | |
cmcfixes67: #i101158# fix parallel build with system lucene, and remove unused copy of MANIFEST.MK
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/help/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | transex3/source/help/makefile.mk | 19 |
2 files changed, 0 insertions, 21 deletions
diff --git a/transex3/source/help/MANIFEST.MF b/transex3/source/help/MANIFEST.MF deleted file mode 100644 index bf0e4ab46cb2..000000000000 --- a/transex3/source/help/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -RegistrationClassName: com.sun.star.help.HelpComponent -Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar diff --git a/transex3/source/help/makefile.mk b/transex3/source/help/makefile.mk index edf68d906133..6fc823a1b59a 100644 --- a/transex3/source/help/makefile.mk +++ b/transex3/source/help/makefile.mk @@ -104,36 +104,17 @@ JAVACLASSFILES = \ $(CLASSDIR)$/$(PACKAGE)$/HelpIndexerTool.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class - -# $(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class \ -# $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class \ -# $(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class \ -# $(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class - -#JARFILES = ridl.jar jurt.jar unoil.jar juh.jar .IF "$(SYSTEM_LUCENE)" == "YES" CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) -COMP=fix_system_lucene .ELSE JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar .ENDIF JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) -#JAVAFILES = $(JAVACLASSFILES) JARCLASSDIRS = $(PACKAGE)/* JARTARGET = HelpIndexerTool.jar JARCOMPRESS = TRUE -#CUSTOMMANIFESTFILE = MANIFEST.MF # --- Targets ------------------------------------------------------ .INCLUDE : target.mk - -.IF "$(JARTARGETN)"!="" -$(JARTARGETN) : $(COMP) -.ENDIF - -fix_system_lucene: - @echo "Fix Java Class-Path entry for Lucene libraries from system." - @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \ - -i ../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF |