User: rt Date: 2007-11-06 15:42:32+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk
Log: INTEGRATION: CWS execshellmacrogone (1.2.10); FILE MERGED 2007/10/24 08:33:18 rene 1.2.10.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/24 06:35:43 rene 1.2.10.1: #i79760# krs patches for supressing "Executing shell macro..." output File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk?r1=1.3&r2=1.4 Delta lines: +3 -3 ------------------- --- makefile.mk 2007-08-02 14:28:35+0000 1.3 +++ makefile.mk 2007-11-06 15:42:30+0000 1.4 @@ -45,17 +45,17 @@ #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar jcommon-1.0.10.jar libxml-0.9.5.jar jfreereport-0.9.0-05.jar libloader-0.3.4.jar sac.jar liblayout-0.2.6.jar jcommon-serializer-0.1.0.jar libfonts-0.2.6.jar libformula-0.1.8.jar -JAVAFILES := $(shell $(FIND) . -name "*.java") +JAVAFILES := $(shell @$(FIND) . -name "*.java") # JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/)) #----- copy .properties and .css files ----------------------------------------- # external find gives / for 4nt too... -# PROPERTYFILES := $(subst,/,$/ $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell $(FIND) . -name "*.properties"))) +# PROPERTYFILES := $(subst,/,$/ $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell @$(FIND) . -name "*.properties"))) PROPERTYFILES := $(CLASSDIR)$/$(PACKAGE)$/configuration.properties \ $(CLASSDIR)$/$(PACKAGE)$/module.properties \ $(CLASSDIR)$/$(PACKAGE)$/parser$/selectors.properties -# CSSFILES := $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell $(FIND) . -name "*.css")) +# CSSFILES := $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell @$(FIND) . -name "*.css")) CSSFILES := $(CLASSDIR)$/$(PACKAGE)$/oasis-datastyle.css\ $(CLASSDIR)$/$(PACKAGE)$/oasis-draw.css\ $(CLASSDIR)$/$(PACKAGE)$/oasis-form.css\ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
