summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--filter/qa/complex/filter/detection/typeDetection/makefile.mk5
-rwxr-xr-xfilter/qa/complex/filter/misc/makefile.mk4
-rw-r--r--filter/source/config/tools/merge/makefile.mk3
-rw-r--r--filter/source/config/tools/split/makefile.mk3
-rw-r--r--filter/source/config/tools/utils/makefile.mk3
-rw-r--r--unoxml/qa/complex/makefile.mk4
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile1
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk4
8 files changed, 11 insertions, 16 deletions
diff --git a/filter/qa/complex/filter/detection/typeDetection/makefile.mk b/filter/qa/complex/filter/detection/typeDetection/makefile.mk
index 1815b90aaa65..dea5044fb60c 100644
--- a/filter/qa/complex/filter/detection/typeDetection/makefile.mk
+++ b/filter/qa/complex/filter/detection/typeDetection/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.102.1 $
#
# This file is part of OpenOffice.org.
#
@@ -39,8 +39,7 @@ PACKAGE = complex$/filter$/detection$/typeDetection
#----- compile .java files -----------------------------------------
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
- OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
JAVAFILES = TypeDetection.java Helper.java
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/filter/qa/complex/filter/misc/makefile.mk b/filter/qa/complex/filter/misc/makefile.mk
index d519265bb745..0dd1c433b28c 100755
--- a/filter/qa/complex/filter/misc/makefile.mk
+++ b/filter/qa/complex/filter/misc/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.7.102.1 $
#
# This file is part of OpenOffice.org.
#
@@ -40,7 +40,7 @@ PACKAGE = complex$/filter$/misc
#----- compile .java files -----------------------------------------
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
JAVAFILES = FinalizedMandatoryTest.java TypeDetection6FileFormat.java
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/filter/source/config/tools/merge/makefile.mk b/filter/source/config/tools/merge/makefile.mk
index e4a7a3997cb3..84175ab43cfb 100644
--- a/filter/source/config/tools/merge/makefile.mk
+++ b/filter/source/config/tools/merge/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.102.1 $
#
# This file is part of OpenOffice.org.
#
@@ -48,7 +48,6 @@ JARFILES = \
unoil.jar \
jurt.jar \
juh.jar \
- jut.jar \
java_uno.jar
CFGFILES = \
diff --git a/filter/source/config/tools/split/makefile.mk b/filter/source/config/tools/split/makefile.mk
index e23aad883ec8..7666515e91e0 100644
--- a/filter/source/config/tools/split/makefile.mk
+++ b/filter/source/config/tools/split/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.7.102.1 $
#
# This file is part of OpenOffice.org.
#
@@ -48,7 +48,6 @@ JARFILES = \
unoil.jar \
jurt.jar \
juh.jar \
- jut.jar \
java_uno.jar
CFGFILES = \
diff --git a/filter/source/config/tools/utils/makefile.mk b/filter/source/config/tools/utils/makefile.mk
index a1db965b49c0..0b2b89efeb7a 100644
--- a/filter/source/config/tools/utils/makefile.mk
+++ b/filter/source/config/tools/utils/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.9.98.2 $
#
# This file is part of OpenOffice.org.
#
@@ -45,7 +45,6 @@ JARFILES = \
unoil.jar \
jurt.jar \
juh.jar \
- jut.jar \
java_uno.jar
JAVACLASSFILES = \
diff --git a/unoxml/qa/complex/makefile.mk b/unoxml/qa/complex/makefile.mk
index cfef613b814e..4a7cd55fd25f 100644
--- a/unoxml/qa/complex/makefile.mk
+++ b/unoxml/qa/complex/makefile.mk
@@ -7,7 +7,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.2.6.1 $
#
# This file is part of OpenOffice.org.
#
@@ -38,7 +38,7 @@ PACKAGE = complex$/unoxml
#----- compile .java files -----------------------------------------
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
JAVAFILES = RDFRepositoryTest.java \
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile
index 64dae6b3851b..96ce07d2d032 100755
--- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile
+++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile
@@ -75,7 +75,6 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
- $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(CLASSPATH) \
$(PATH_SEPARATOR)$(OUT_COMPONENT) \
)
diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk
index cca5f41b71da..58563ba29302 100755
--- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk
+++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.5.10.1 $
#
# This file is part of OpenOffice.org.
#
@@ -36,7 +36,7 @@ TARGET = examples_java_converterbridge
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar ridl.jar
+JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar ridl.jar
JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
JARCOMPRESS = TRUE
CUSTOMMANIFESTFILE = manifest