diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 15:18:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 15:18:16 +0000 |
| commit | 1f234c14fa4842d6f82eaf62e32ddfa45c7a0c8e (patch) | |
| tree | 5ec5ceba4f2e5a56960eef80d70c31bac4519330 /odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice | |
| parent | db7820019023795a372cdd55d7854aa0953d922f (diff) | |
INTEGRATION: CWS sdksample (1.4.4); FILE MERGED
2005/01/28 14:15:20 jsc 1.4.4.5: #i29308# prepare path for del command (windows only)
2004/10/29 07:33:42 jsc 1.4.4.4: #i29308# cleanup
2004/07/30 08:35:30 jsc 1.4.4.3: #i29308# integrate new multiple inheritance interface
2004/06/30 09:10:28 jsc 1.4.4.2: #i29308# use of new UNO features
2004/06/24 09:39:02 jsc 1.4.4.1: #i26335# use zip for packaging
Diffstat (limited to 'odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice')
| -rw-r--r-- | odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile index 855c7ba5763c..2051fdfce916 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2004-05-18 13:22:14 $ +# last change: $Author: rt $ $Date: 2005-01-31 16:18:16 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -49,26 +49,15 @@ include $(SETTINGS)/dk.mk include ../../../thumbs.mk -IDLFILES = XImageShrink.idl - -IDLFILES2 = ImageShrink.idl - PACKAGE = org/openoffice/test -GENJAVAFILES = $(patsubst %.idl,$(OUT_COMP_GEN)/$(PACKAGE)/%.java,$(IDLFILES)) -GENURDFILES = $(patsubst %.idl,$(OUT_COMP_GEN)/%.urd,$(IDLFILES)) -GENURDFILES += $(patsubst %.idl,$(OUT_COMP_GEN)/%.urd,$(IDLFILES2)) - -CLASSFILES = $(subst $(OUT_COMP_GEN),$(OUT_COMP_CLASS),$(GENJAVAFILES:.java=.class)) - SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\ $(PATH_SEPARATOR)$(OUT_COMP_CLASS)) - # Targets .PHONY: ALL ALL : \ - $(CLASSFILES) + $(GENCLASSFILES) include $(SETTINGS)/stdtarget.mk @@ -77,18 +66,14 @@ $(OUT_COMP_GEN)/%.urd : %.idl $(IDLC) -I. -I../../.. -I$(IDL_DIR) -O$(OUT_COMP_GEN) $^ $(OUT_COMP_GEN)/%.rdb : $(GENURDFILES) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) -$(MKDIR) $(subst /,$(PS),$(@D)) - -$(DEL) $(subst /,$(PS),$@) $(REGMERGE) $@ /UCR $(GENURDFILES) -$(OUT_COMP_GEN)/%.java : $(COMPONENT_RDB) - -$(MKDIR) $(subst /,$(PS),$(@D)) - $(JAVAMAKER) -BUCR -nD -T$(subst /,.,$(patsubst $(OUT_COMP_GEN)/%.java,%,$@)) -O$(OUT_COMP_GEN) $(COMPONENT_RDB) $(DKREGISTRYNAME) - -$(CLASSFILES) : $(GENJAVAFILES) +$(OUT_COMP_CLASS)/%.class : $(COMPONENT_RDB) -$(MKDIR) $(subst /,$(PS),$(@D)) - $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(GENJAVAFILES) + $(JAVAMAKER) -BUCR -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMPONENT_RDB) $(OFFICE_TYPE_LIBRARY) .PHONY: clean clean : - -$(DEL) $(subst \\,\,$(subst /,$(PS),$(CLASSFILES))) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(GENCLASSFILES))) |