diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 09:47:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 09:47:46 +0000 |
| commit | 5ba35723bc73258d24ed2af00c65bf5d93406fd5 (patch) | |
| tree | 22ea3a2c3a6004acf2713ddb2b9ee15c07145931 /odk/examples/java/Spreadsheet | |
| parent | d629574d4677fd294c0163b303becc6d98af9c38 (diff) | |
INTEGRATION: CWS sdk02 (1.2.6); FILE MERGED
2003/05/14 11:46:13 jsc 1.2.6.1: #109045# insert JAVAC_FLAGS option
Diffstat (limited to 'odk/examples/java/Spreadsheet')
| -rw-r--r-- | odk/examples/java/Spreadsheet/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/odk/examples/java/Spreadsheet/Makefile b/odk/examples/java/Spreadsheet/Makefile index b98c318b0abd..f5610c95173e 100644 --- a/odk/examples/java/Spreadsheet/Makefile +++ b/odk/examples/java/Spreadsheet/Makefile @@ -58,37 +58,40 @@ ALL : JavaSpreadsheetExamples include $(SETTINGS)/stdtarget.mk -$(OUT_COMP_GEN) : $(OUT) - $(MKDIR) $(subst /,$(PS),$@) - $(MKDIR) $(subst /,$(PS),$(OUT_COMP_CLASS)) - -$(OUT_COMP_CLASS)/%.Manifest : $(OUT_COMP_GEN) +$(OUT_COMP_CLASS)/%.Manifest : + -$(MKDIR) $(subst /,$(PS),$(@D)) @echo RegistrationClassName: $(basename $(basename $(@F)))> $@ -$(OUT_COMP_GEN)/%.urd : %.idl $(OUT_COMP_GEN) +$(OUT_COMP_GEN)/%.urd : %.idl + -$(MKDIR) $(subst /,$(PS),$(@D)) idlc -C -I. -I$(IDL_DIR) -O$(OUT_COMP_GEN) $< $(OUT_COMP_GEN)/%.rdb : $(GENURDFILES) + -$(MKDIR) $(subst /,$(PS),$(@D)) -$(DEL) $(subst /,$(PS),$@) regmerge $@ /UCR $(GENURDFILES) -$(OUT_COMP_GEN)/%.java : $(COMPONENT1_RDB) $(OUT_COMP_GEN) +$(OUT_COMP_GEN)/%.java : $(COMPONENT1_RDB) + -$(MKDIR) $(subst /,$(PS),$(@D)) javamaker -BUCR -nD -T$(subst /,.,$(patsubst $(OUT_COMP_GEN)/%.java,%,$@)) -O$(OUT_COMP_GEN) $(COMPONENT1_RDB) $(DKREGISTRYNAME) -$(CLASSFILES) : $(OUT_COMP_GEN) $(JAVAFILES) $(GENJAVAFILES) - javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(GENJAVAFILES) $(JAVAFILES) +$(CLASSFILES) : $(JAVAFILES) $(GENJAVAFILES) + -$(MKDIR) $(subst /,$(PS),$(@D)) + javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(GENJAVAFILES) $(JAVAFILES) $(OUT_CLASS)/%.jar : $(OUT_COMP_CLASS)/%.Manifest $(CLASSFILES) -# jar cvfm $@ $< -C $(OUT_COMP_CLASS) . + -$(MKDIR) $(subst /,$(PS),$(@D)) cd $(OUT_COMP_CLASS) && jar cvfm ../$(@F) $(<F) $($(basename $(basename $(@F)))_CLASSFILES) $(OUT_BIN)/%.zip : $(OUT_COMP_GEN)/%.rdb $(OUT_CLASS)/%.jar + -$(MKDIR) $(subst /,$(PS),$(@D)) $(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_CLASS)) cd $(OUT_CLASS) && jar cvfM ../bin/$(@F) $(^F) $(DEL) $(subst /,$(PS),$(OUT_CLASS)/$(<F)) $(REGISTERFLAG) : $(COMPONENT1_PACKAGE) ifneq "$(SDK_AUTO_DEPLOYMENT)" "" + -$(MKDIR) $(subst /,$(PS),$(@D)) -$(DEL) $(subst /,$(PS),$@) $(DEPLOYTOOL) $(COMPONENT1_PACKAGE_URL) @echo flagged > $(subst /,$(PS),$@) |