diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:15:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:15:04 +0000 |
| commit | de8972745d9e76e589349ad0f5376273bce37ccb (patch) | |
| tree | 8f92f4bab1e46bcb4fc5039ebc548329f557088e | |
| parent | INTEGRATION: CWS jsc5 (1.3.46); FILE MERGED (diff) | |
| download | core-de8972745d9e76e589349ad0f5376273bce37ccb.tar.gz core-de8972745d9e76e589349ad0f5376273bce37ccb.zip | |
INTEGRATION: CWS jsc5 (1.7.46); FILE MERGED
2006/02/02 12:15:39 jsc 1.7.46.1: i59703# adapt makefile to be prepared for full qualified paths
| -rw-r--r-- | odk/examples/DevelopersGuide/Spreadsheet/Makefile | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/Makefile b/odk/examples/DevelopersGuide/Spreadsheet/Makefile index 8fede23d5972..939a097f6abf 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/Makefile +++ b/odk/examples/DevelopersGuide/Spreadsheet/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-03-29 12:14:24 $ +# last change: $Author: kz $ $Date: 2006-02-03 17:15:04 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -208,11 +208,25 @@ $(COMP2_PACKAGE) : $(COMP2_JAR) $(COMP2_UNOPKG_MANIFEST) cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)) && $(SDK_ZIP) ../../bin/$(@F) $(<F) cd $(subst /,$(PS),$(COMP2_GEN_OUT)/$(subst .$(UNOPKG_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../../bin/$(@F) META-INF/manifest.xml -$(SAMPLE_GEN_OUT)/devguide_%_register_component.flag : $(OUT_BIN)/%.$(UNOPKG_EXT) +$(SAMPLE_GEN_OUT)/devguide_$(COMP1_NAME)_register_component.flag : $(OUT_BIN)/$(COMP1_NAME).$(UNOPKG_EXT) ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) -$(MKDIR) $(subst /,$(PS),$(@D)) - $(DEPLOYTOOL) $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$*.$(UNOPKG_EXT)") + $(DEPLOYTOOL) $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP1_NAME).$(UNOPKG_EXT)") + @echo flagged > $(subst /,$(PS),$@) +else + @echo -------------------------------------------------------------------------------- + @echo If you want to install your component automatically, please set the environment + @echo variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only + @echo possible if no office instance is running. + @echo -------------------------------------------------------------------------------- +endif + +$(SAMPLE_GEN_OUT)/devguide_$(COMP2_NAME)_register_component.flag : $(OUT_BIN)/$(COMP2_NAME).$(UNOPKG_EXT) +ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" + -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) + -$(MKDIR) $(subst /,$(PS),$(@D)) + $(DEPLOYTOOL) $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP2_NAME).$(UNOPKG_EXT)") @echo flagged > $(subst /,$(PS),$@) else @echo -------------------------------------------------------------------------------- |