diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:34:35 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:34:35 +0000 |
commit | 5becb21c10796bdc27f88f5bc955cf8dce026774 (patch) | |
tree | 50697ad220981c67d8b4b0d4488408a1c830683b /helpcontent2/util/target.pmk | |
parent | 1c76e5c320eb7421d9dde0f20e1b949f968dd58c (diff) |
INTEGRATION: CWS helplinker01redux (1.18.4); FILE MERGED
2007/06/13 13:07:15 cmc 1.18.4.1: #i70155 native HelpLinker
Diffstat (limited to 'helpcontent2/util/target.pmk')
-rwxr-xr-x | helpcontent2/util/target.pmk | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index a335947196..1dcd828df0 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -4,9 +4,9 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: vg $ $Date: 2007-06-08 16:35:26 $ +# last change: $Author: hr $ $Date: 2007-06-26 12:34:35 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,27 +36,7 @@ LINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(BIN)$/$(LINKNAME)_$i.zip) LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES))) -.IF "$(SOLAR_JAVA)"!="" ALLTAR : $(LINKALLTARGETS) -.ENDIF - -.IF "$(SYSTEM_DB)" != "YES" -JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) -.ENDIF - -.IF "$(JDK)" != "gcj" -JAVA_VM_HEAP_SIZE = -Xms256m -Xmx256m -.ENDIF - -.IF "$(JAVAAOTCOMPILER)" != "" -CLASSPATH!:=$(my_cp) -.EXPORT : CLASSPATH -.ENDIF $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag -.IF "$(JAVAAOTCOMPILER)" != "" - com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) -.ELSE - $(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) -.ENDIF - + $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) |