diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:25:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:25:54 +0000 |
| commit | f8890579bec945a63c0ea1e8a92d166e96f48775 (patch) | |
| tree | f496c62d45bc7c82dbac354076071bd57a54f19a /odk/examples/DevelopersGuide/OfficeDev/DisableCommands | |
| parent | 171fa03cbfd300d329b056b3844b1faad9db5a5d (diff) | |
INTEGRATION: CWS sdk13 (1.3.100); FILE MERGED
2004/05/05 09:31:28 jsc 1.3.100.1: #116658# merge cinnabar changes
Diffstat (limited to 'odk/examples/DevelopersGuide/OfficeDev/DisableCommands')
| -rw-r--r-- | odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile index 2e33603390ba..06a1a8b5dbc9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2003-06-30 15:37:40 $ +# last change: $Author: rt $ $Date: 2004-05-18 13:25:39 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -56,11 +56,7 @@ 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)) @@ -74,7 +70,7 @@ $(OUT_COMP_CLASS) : $(OUT) $(MKDIR) $(subst /,$(PS),$@) $(CLASSFILES) : $(OUT_COMP_CLASS) $(JAVAFILES) - javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) + $(SDK_JAVAC) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) OfficeDevDisableCommandsTest : $(CLASSFILES) @echo -------------------------------------------------------------------------------- @@ -84,7 +80,7 @@ OfficeDevDisableCommandsTest : $(CLASSFILES) @echo -------------------------------------------------------------------------------- %.run: $(OUT_COMP_CLASS)/%.class - java -classpath "$(SDK_CLASSPATH)" $(basename $@) + $(SDK_JAVA) -classpath "$(SDK_CLASSPATH)" $(basename $@) .PHONY: clean clean : |