summaryrefslogtreecommitdiff
path: root/reportdesign/util
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-25 06:38:25 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-25 06:38:25 +0000
commite89954e7ce67737a26a5f9012e1aac34e554d441 (patch)
tree2064208d73d4c1939ce83e626cc5345c7ef55b81 /reportdesign/util
parent7f5920a974d7c482f83e448e77168a1d9c0416f4 (diff)
INTEGRATION: CWS dba30g (1.19.8); FILE MERGED
2008/07/21 10:56:35 fs 1.19.8.2: #i91909# +COMPONENT_HELP 2008/07/15 11:24:37 lla 1.19.8.1: #i91666# add new reportbuilderwizard.jar to the report design extension, was lost somewhere else
Diffstat (limited to 'reportdesign/util')
-rw-r--r--reportdesign/util/makefile.mk16
1 files changed, 12 insertions, 4 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index 16715ef7b375..5e9539c9c943 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.19 $
+# $Revision: 1.20 $
#
# This file is part of OpenOffice.org.
#
@@ -220,6 +220,9 @@ COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
COMPONENT_JARFILES = \
$(EXTENSIONDIR)$/sun-report-builder.jar
+COMPONENT_HELP= \
+ $(EXTENSIONDIR)$/help$/component.txt
+
# .jar files from solver
COMPONENT_EXTJARFILES = \
$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar \
@@ -233,13 +236,14 @@ COMPONENT_EXTJARFILES = \
$(EXTENSIONDIR)$/libxml-0.9.9.jar \
$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar \
$(EXTENSIONDIR)$/sac.jar \
- $(EXTENSIONDIR)$/sun-report-builder.jar
+ $(EXTENSIONDIR)$/sun-report-builder.jar \
+ $(EXTENSIONDIR)$/reportbuilderwizard.jar
COMPONENT_MANIFEST_GENERIC:=TRUE
COMPONENT_MANIFEST_SEARCHDIR:=registry
# make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES)
+EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP)
# --- Targets ----------------------------------
@@ -265,7 +269,11 @@ $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADM
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-.ELSE # "$(SOLAR_JAVA)"!=""
+$(COMPONENT_HELP) : $$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+ .ELSE # "$(SOLAR_JAVA)"!=""
.INCLUDE : target.mk
.ENDIF # "$(SOLAR_JAVA)"!=""
#