diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2002-05-08 15:32:12 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2002-05-08 15:32:12 +0000 |
| commit | 8516500bf709c44a3f734d019e7879dc110d9137 (patch) | |
| tree | 180da3dfe1a4f80ee384a6c4641e45cb4d0e6e81 /odk/examples/java/ToDo/Makefile | |
| parent | d5ab3c130d97605bc0876efce27782036fa2f315 (diff) | |
#99053# change CLASSPATH
Diffstat (limited to 'odk/examples/java/ToDo/Makefile')
| -rw-r--r-- | odk/examples/java/ToDo/Makefile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile index 33266907ab3e..00f018af0244 100644 --- a/odk/examples/java/ToDo/Makefile +++ b/odk/examples/java/ToDo/Makefile @@ -36,19 +36,18 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES)) CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES)) -DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\ - $(CLASSES_DIR)$(PS)jurt.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\ +SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\ + $(OFFICE_CLASSES_DIR)$(PS)jurt.jar\ + $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\ + $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\ + $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\ + $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\ + $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\ + $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\ $(PATH_SEPARATOR)$(OUT_COMPONENT)\ ) OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH)) -OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH))) # Targets @@ -68,7 +67,7 @@ $(TYPEFLAG) : $(IDLFILES) @echo bla > $@ $(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES) - javac -classpath $(DK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES) + javac -classpath $(SDK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES) @echo bla > $@ $(COMPONENTJARFLAG) : $(JAVAFLAG) @@ -79,8 +78,8 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG) $(REGISTERFLAG) : $(COMPONENTJARFLAG) ifneq "$(OFFICE_PROGRAM_PATH)" "" $(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 + $(COPY) $(COMPONENT_JAR) "$(OFFICE_CLASSES_DIR)" + java -classpath "$(SDK_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 -------------------------------------------------------------------------------- |