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 | 61f2bb111eb26fec88e928883edb739f1b599ab3 (patch) | |
| tree | 55c10e09d5a58ef1c95d0c28f396ae9b2e6e4fbd /xmerge | |
| parent | f8554691867015787fa8d84d40f8b90a6797f89f (diff) | |
CWS-TOOLING: integrate CWS sb93
Diffstat (limited to 'xmerge')
| -rwxr-xr-x | xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile | 1 | ||||
| -rwxr-xr-x | xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk | 4 |
2 files changed, 2 insertions, 3 deletions
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 |