diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2001-10-31 10:55:29 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2001-10-31 10:55:29 +0000 |
| commit | 06f5dd48c6bd175489fd87ed8f082cc9c4ec4a35 (patch) | |
| tree | 14bdf492a41a6deac5f0aa4e4e970583979748fd /odk/examples/java/ToDo | |
| parent | 43431583eb8ecf1379e8b04ddfaa25031914278d (diff) | |
#87796# changes for spaces in pathes
Diffstat (limited to 'odk/examples/java/ToDo')
| -rw-r--r-- | odk/examples/java/ToDo/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile index 91209954160c..33266907ab3e 100644 --- a/odk/examples/java/ToDo/Makefile +++ b/odk/examples/java/ToDo/Makefile @@ -29,14 +29,14 @@ PACKAGE = org$(PS)OpenOffice JAVAFILES = ToDo.java -GENJAVAFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)$(PACKAGE)$(PS)%.java,$(IDLFILES) ) -GENURDFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)%.urd,$(IDLFILES) ) +GENJAVAFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)$(PACKAGE)$(PS)%.java,$(IDLFILES)) +GENURDFILES = $(subst \\,\,$(patsubst %.idl,$(OUT_MISC)$(PS)%.urd,$(IDLFILES))) -CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) ) +CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES)) -CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) ) +CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES)) -DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ +DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\ $(CLASSES_DIR)$(PS)jurt.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\ @@ -44,11 +44,11 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\ - $(PATH_SEPARATOR)$(OUT_COMPONENT) \ + $(PATH_SEPARATOR)$(OUT_COMPONENT)\ ) OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH)) -OFFICE_CLASSPATH = $(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes, $(DK_CLASSPATH)) +OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH))) # Targets @@ -78,9 +78,9 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG) $(REGISTERFLAG) : $(COMPONENTJARFLAG) ifneq "$(OFFICE_PROGRAM_PATH)" "" - $(BIN_DIR)$(PS)regmerge $(OFFICE_PROGRAM_PATH)$(PS)applicat.rdb /UCR $(GENURDFILES) - $(COPY) $(COMPONENT_JAR) $(OFFICE_PROGRAM_PATH)$(PS)classes - java -classpath $(OFFICE_CLASSPATH) com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/ToDo.jar" com.sun.star.loader.Java2 + $(BIN_DIR)$(PS)regmerge "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" /UCR $(GENURDFILES) + $(COPY) $(COMPONENT_JAR) "$(OFFICE_PROGRAM_PATH)/classes" + java -classpath "$(OFFICE_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/ToDo.jar" com.sun.star.loader.Java2 @echo bla > $@ else @echo -------------------------------------------------------------------------------- |