User: vg Date: 2008-08-19 10:20:54+0000 Modified: dba/reportdesign/util/makefile.mk
Log: INTEGRATION: CWS dba31a (1.18.20); FILE MERGED 2008/07/30 12:08:25 fs 1.18.20.4: RESYNC: (1.19-1.20); FILE MERGED 2008/07/18 07:46:30 lla 1.18.20.3: #i90874# lost reportbuilderwizard.jar already fixed in i91666 2008/07/02 09:19:46 oj 1.18.20.2: RESYNC: (1.18-1.19); FILE MERGED 2008/07/01 07:02:17 oj 1.18.20.1: #i77916# impl zoom and move config data into ext File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.20&r2=1.21 Delta lines: +14 -3 -------------------- --- makefile.mk 2008-07-25 07:38:25+0000 1.20 +++ makefile.mk 2008-08-19 10:20:51+0000 1.21 @@ -206,9 +206,20 @@ $(EXTENSIONDIR)$/META-INF$/manifest.xml COMPONENT_MERGED_XCU= \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Setup.xcu \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ReportDesign.xcu \ - $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Paths.xcu + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ExtendedColorScheme.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Embedding.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Paths.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/TypeDetection$/Filter.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/TypeDetection$/Types.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/ReportCommands.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/Controller.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/DbReportWindowState.xcu \ + $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/UI$/DbReportWindowState.xcs \ + $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/UI$/ReportCommands.xcs \ + $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/ReportDesign.xcs COMPONENT_OTR_FILES= \ $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr @@ -273,7 +284,7 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ - .ELSE # "$(SOLAR_JAVA)"!="" +.ELSE # "$(SOLAR_JAVA)"!="" .INCLUDE : target.mk .ENDIF # "$(SOLAR_JAVA)"!="" # --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
