diff -urN ooo_SRC680_m161_src.orig/odk/pack/gendocu/makefile.mk ooo_SRC680_m161_src/odk/pack/gendocu/makefile.mk --- ooo_SRC680_m161_src.orig/odk/pack/gendocu/makefile.mk 2005-12-30 17:31:55.000000000 +0100 +++ ooo_SRC680_m161_src/odk/pack/gendocu/makefile.mk 2006-03-24 21:33:46.000000000 +0100 @@ -96,6 +96,7 @@ all: \ $(CPP_DOCU_INDEX_FILE) \ $(JAVA_DOCU_INDEX_FILE) + .ELSE all: $(CPP_DOCU_INDEX_FILE) .ENDIF @@ -108,21 +109,21 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG) +-$(MKDIRHIER) $(@:d) +$(MY_AUTODOC) -html $(DESTDIRGENCPPREF) -name $(CPPDOCREFNAME) $(AUTODOCPARAMS) - +-rm $(@:d)$/cpp.css - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d)$/cpp.css + +-rm $(@:d:d)$/cpp.css + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css -$(JAVA_SRC_DIR)$/%.zip : $(SOLARCOMMONBINDIR)$/%.zip +$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f) +-$(MKDIRHIER) $(@:d) +$(MY_COPY) $< $@ - +cd $(JAVA_SRC_DIR) && unzip -quod . $(@:f) + +cd $(JAVA_SRC_DIR) && unzip -quo $(@:f) #$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/%.java : $(PRJ)$/source$/bean$/com$/sun$/star$/beans$/%.java # +-$(MKDIRHIER) $(@:d) # +$(MY_COPY) $< $@ -#$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES) +#$(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES) .IF "$(SOLAR_JAVA)"!="" -$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) +$(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES) +-$(MKDIRHIER) $(@:d) $(WRAPCMD) $(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG) .ENDIF