diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:22:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:22:01 +0000 |
| commit | 66f46152a7d1ed251d81540613ff941b355ef0a1 (patch) | |
| tree | 0468fa201d8f646d4e497e0df12ecbf066ad00c5 /odk/examples/DevelopersGuide/Components/Thumbs | |
| parent | 13bfc7d1503317e7c64344252e4306d581de56d4 (diff) | |
INTEGRATION: CWS sdk13 (1.4.94); FILE MERGED
2004/05/05 09:31:21 jsc 1.4.94.1: #116658# merge cinnabar changes
Diffstat (limited to 'odk/examples/DevelopersGuide/Components/Thumbs')
| -rw-r--r-- | odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile index 030706e56e85..4953d0a86b2d 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: vg $ $Date: 2003-07-09 10:37:49 $ +# last change: $Author: rt $ $Date: 2004-05-18 13:22:01 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -59,11 +59,7 @@ JAVAFILES = \ CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/$(PACKAGE)/%.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)) @@ -80,23 +76,23 @@ $(OUT_COMP_CLASS)/%.Manifest : $(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) -$(OUT_CLASS)/%.jar : $(OUT_COMP_CLASS)/%.Manifest $(CLASSFILES) +$(COMPONENT_JAR) : $(COMPONENT_MANIFESTFILE) $(CLASSFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - jar cvfm $@ $< -C $(OUT_COMP_CLASS) . + $(SDK_JAR) cvfm $@ $< -C $(OUT_COMP_CLASS) . -$(OUT_BIN)/%.zip : $(OUT_COMP_GEN)/%.rdb $(OUT_CLASS)/%.jar +$(COMPONENT_PACKAGE) : $(COMPONENT_RDB) $(COMPONENT_JAR) -$(MKDIR) $(subst /,$(PS),$(@D)) $(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_CLASS)) - cd $(subst /,$(PS),$(OUT_CLASS)) && jar cvfM ../bin/$(@F) $(^F) - $(DEL) $(subst /,$(PS),$(OUT_CLASS)/$(<F)) + cd $(subst /,$(PS),$(OUT_CLASS)) && $(SDK_JAR) cvfM ../bin/$(@F) $(^F) + $(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_CLASS)/$(<F))) -$(REGISTERFLAG) : $(COMPONENT1_PACKAGE) -ifneq "$(SDK_AUTO_DEPLOYMENT)" "" +$(REGISTERFLAG) : $(COMPONENT_PACKAGE) +ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" -$(MKDIR) $(subst /,$(PS),$(@D)) -$(DEL) $(subst /,$(PS),$@) - $(DEPLOYTOOL) $(COMPONENT1_PACKAGE_URL) + $(DEPLOYTOOL) $(COMPONENT_PACKAGE_URL) @echo flagged > $(subst /,$(PS),$@) else @echo -------------------------------------------------------------------------------- @@ -108,6 +104,6 @@ endif .PHONY: clean clean : - -$(DEL) $(subst /,$(PS),$(COMPONENT1_PACKAGE_URL)) - -$(DEL) $(subst /,$(PS),$(COMPONENT1_JAR)) - -$(DEL) $(subst /,$(PS),$(REGISTERFLAG)) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMPONENT_PACKAGE_URL))) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMPONENT_JAR))) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(REGISTERFLAG))) |