User: kz Date: 2007-12-12 13:15:32+0000 Modified: dba/reportdesign/util/makefile.mk
Log: INTEGRATION: CWS configure22 (1.9.4); FILE MERGED 2007/12/03 15:39:29 rene 1.9.4.2: fix build. jar names are hardcoded in the manifest. If people want to change them, they have to patch manifest #i10000# we need a dep on readlicense_oo 2007/12/02 12:34:16 rene 1.9.4.1: #i84165# --enable-sdext, --disable-reportdesign and --with-system-jfreereport File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.9&r2=1.10 Delta lines: +9 -4 ------------------- --- makefile.mk 2007-11-27 11:59:51+0000 1.9 +++ makefile.mk 2007-12-12 13:15:29+0000 1.10 @@ -233,8 +233,7 @@ LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />) .ENDIF # "$(GUI)"!="WNT" - -REPRORTJARFILES := \ +REPORTJARFILES := \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ $(ZIP1DIR)$/sac.jar \ $(ZIP1DIR)$/libxml-0.9.5.jar \ @@ -252,7 +251,7 @@ .INCLUDE : target.mk .IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) +$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" $(MISC)$/update_report.flag : $(XCU_FILES) @@ -286,9 +285,15 @@ echo $(XCU_TMP) $(COPY) $< $@ +.IF "$(SYSTEM_JFREEREPORT)" == "YES" +$(ZIP1DIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ +.ELSE $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +.ENDIF $(ZIP1DIR)$/%.jar : $(CLASSDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
