diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-27 10:59:51 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-27 10:59:51 +0000 |
| commit | 2bb0c1ccfa05fbd07d9d72b5322f3cf1e7813c60 (patch) | |
| tree | 2a8a20c207041058a79ab34450af841b8f8c308e /reportdesign | |
| parent | fcde4857feecae2ea34aa1bff99866fa30548937 (diff) | |
INTEGRATION: CWS dba24lms (1.8.22); FILE MERGED
2007/11/21 12:14:16 oj 1.8.22.2: build problem when WITH_LANG is not set
2007/11/09 09:45:18 oj 1.8.22.1: #i83469# insert strings
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/util/makefile.mk | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index aa2deed567a3..bf8d1638f69c 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2007-09-26 14:25:36 $ +# last change: $Author: ihi $ $Date: 2007-11-27 11:59:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,10 +44,9 @@ GEN_HID_OTHER=TRUE no_common_build_zip=true # --- Settings ---------------------------------- -.INCLUDE : settings.mk +.INCLUDE : settings.mk # ------------------------------------------------------------------ - # --- reportdesign core (rpt) ----------------------------------- LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -212,6 +211,15 @@ ZIP1EXT=.oxt XMLFILES := $(ZIP1DIR)$/description.xml \ $(ZIP1DIR)$/META-INF$/manifest.xml + +XCU_FILES := $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ + $(ZIP1DIR)$/merge$/org$/openoffice$/Office$/DataAccess.xcu + +.IF "$(WITH_LANG)"!="" +XCU_TMP := $(MISC)$/merge$/org$/openoffice$/Office$/DataAccess.xcu +.ELSE //"$(WITH_LANG)" != "" +XCU_TMP := $(MISC)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu +.ENDIF //"$(WITH_LANG)" != "" HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ $(ZIP1DIR)$/readme_en-US.html \ @@ -225,6 +233,7 @@ TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/license_$i.txt) 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 := \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ $(ZIP1DIR)$/sac.jar \ @@ -246,6 +255,9 @@ REPRORTJARFILES := \ $(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" +$(MISC)$/update_report.flag : $(XCU_FILES) + $(TOUCH) $@ + $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml @@ -265,6 +277,15 @@ $(ZIP1DIR)$/%.xml : %.xml @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/%.xcu : $(MISC)$/registry$/data$/org$/openoffice$/Office$/%.xcu + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/merge$/org$/openoffice$/Office$/%.xcu : $(XCU_TMP) + @@-$(MKDIRHIER) $(@:d) + echo $(XCU_TMP) + $(COPY) $< $@ + $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ @@ -273,9 +294,9 @@ $(ZIP1DIR)$/%.jar : $(CLASSDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/META-INF$/%.xml : %.xml +$(ZIP1DIR)$/META-INF$/manifest.xml : manifest.xml $(MISC)$/update_report.flag @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ + $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(ZIP1DIR) registry $(@:d:d) $(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) |