summaryrefslogtreecommitdiff
path: root/odk/examples/java/Text
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-05-18 12:32:37 +0000
committerRüdiger Timm <rt@openoffice.org>2004-05-18 12:32:37 +0000
commit1fbb05b8f0c01a92d0919f23b635c3312d7fefa0 (patch)
tree32b3dde156082024d7e0fff483a57873578cff51 /odk/examples/java/Text
parent2a061abbc371c315fc619200e1c93385e577cb84 (diff)
INTEGRATION: CWS sdk13 (1.4.100); FILE MERGED
2004/05/05 09:31:46 jsc 1.4.100.1: #116658# merge cinnabar changes
Diffstat (limited to 'odk/examples/java/Text')
-rw-r--r--odk/examples/java/Text/Makefile17
1 files changed, 6 insertions, 11 deletions
diff --git a/odk/examples/java/Text/Makefile b/odk/examples/java/Text/Makefile
index 1fa7053e59d3..e669211fe52a 100644
--- a/odk/examples/java/Text/Makefile
+++ b/odk/examples/java/Text/Makefile
@@ -2,9 +2,9 @@
#
# $RCSfile: Makefile,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: hr $ $Date: 2003-06-30 15:59:46 $
+# last change: $Author: rt $ $Date: 2004-05-18 13:32:37 $
#
# The Contents of this file are made available subject to the terms of
# the BSD license.
@@ -64,14 +64,9 @@ JAVAFILES = \
CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/%.class,$(JAVAFILES))
-SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
- $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
- $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
- $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
- $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
+SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\
$(PATH_SEPARATOR)$(OUT_COMP_CLASS))
-
# Targets
.PHONY: ALL
ALL : \
@@ -81,7 +76,7 @@ include $(SETTINGS)/stdtarget.mk
$(CLASSFILES) : $(JAVAFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
- javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
+ $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
JavaTextExamples : $(CLASSFILES)
@echo --------------------------------------------------------------------------------
@@ -111,10 +106,10 @@ JavaTextExamples : $(CLASSFILES)
@echo --------------------------------------------------------------------------------
%.run: $(OUT_COMP_CLASS)/%.class
- java -classpath "$(SDK_CLASSPATH)" $(basename $@)
+ $(SDK_JAVA) -classpath "$(SDK_CLASSPATH)" $(basename $@)
GraphicsInserter.run: $(OUT_COMP_CLASS)/GraphicsInserter.class
- java -classpath "$(SDK_CLASSPATH)" $(basename $@) oo_smiley.gif
+ $(SDK_JAVA) -classpath "$(SDK_CLASSPATH)" $(basename $@) oo_smiley.gif
.PHONY: clean
clean :