diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
commit | c8ebff286bc889d44236ab17de63fc3712c97acd (patch) | |
tree | 8e2c08a0d8d05fc4ee6ecf3015cec477adb9d911 | |
parent | 472c359e465e8705ebc80119c139dff78549d201 (diff) |
CWS-TOOLING: integrate CWS sb93
4 files changed, 7 insertions, 8 deletions
diff --git a/dbaccess/qa/complex/dbaccess/makefile.mk b/dbaccess/qa/complex/dbaccess/makefile.mk index 1631a89ceadf..7ce8fc260c8d 100755 --- a/dbaccess/qa/complex/dbaccess/makefile.mk +++ b/dbaccess/qa/complex/dbaccess/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.13.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/dbaccess #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar JAVAFILES := $(shell @$(FIND) ./*.java) JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/reportdesign/java/com/sun/star/report/function/metadata/makefile.mk b/reportdesign/java/com/sun/star/report/function/metadata/makefile.mk index af3f33275a55..653839388818 100644 --- a/reportdesign/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportdesign/java/com/sun/star/report/function/metadata/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.3.22.2 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,6 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- -# JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar .IF "$(SYSTEM_JFREEREPORT)" == "YES" CLASSPATH!:==$(CLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR) .ELSE diff --git a/reportdesign/java/com/sun/star/report/makefile.mk b/reportdesign/java/com/sun/star/report/makefile.mk index 646297fc331a..6da38ddddf8f 100644 --- a/reportdesign/java/com/sun/star/report/makefile.mk +++ b/reportdesign/java/com/sun/star/report/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.8.46.2 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/report .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar .IF "$(SYSTEM_JFREEREPORT)" == "YES" XCLASSPATH!:==$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR) .ELSE diff --git a/reportdesign/java/com/sun/star/report/pentaho/makefile.mk b/reportdesign/java/com/sun/star/report/pentaho/makefile.mk index 50734211fa92..baaa3c47bd07 100644 --- a/reportdesign/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportdesign/java/com/sun/star/report/pentaho/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.7.58.2 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ nodep=true .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar .IF "$(SYSTEM_JFREEREPORT)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)librepository-0.1.4.jar .ELSE |