summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2013-02-13 20:21:44 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-02-14 08:32:39 +0000
commit3a2d996b374be25af3cf8d33ed553c33b39cb96f (patch)
tree3179998fbae7704c28e50333e6feb0739713908a /odk
parent97751d8ae088763e7d997bdc1de9c89b3ee6c36b (diff)
don't use -notimestanp when using gjdoc as javadoc
Conflicts: config_host.mk.in Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 Reviewed-on: https://gerrit.libreoffice.org/2142 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'odk')
-rw-r--r--odk/pack/gendocu/makefile.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 0e51d1c0be09..f3e5b080e794 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
-JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+.IF "$(JAVADOCISGJDOC)" != "yes"
+JAVADOCPARAMS+= -notimestamp
+.ENDIF
JAVADOCLOG = $(MISC)$/javadoc_log.txt