PatchSet 6944
Date: 2005/10/18 21:23:23
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Only install javadoc wrapper if gjdoc is built
2005-10-18 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/scripts/Makefile.am:
Only install the javadoc wrapper script if gjdoc is being built.
Simplified conditionals.
Reported by: Petteri Raety <[EMAIL PROTECTED]>
* kaffe/scripts/compat/Makefile.am:
Simplified conditionals.
Members:
ChangeLog:1.4467->1.4468
kaffe/scripts/Makefile.am:1.14->1.15
kaffe/scripts/Makefile.in:1.180->1.181
kaffe/scripts/compat/Makefile.am:1.4->1.5
kaffe/scripts/compat/Makefile.in:1.159->1.160
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4467 kaffe/ChangeLog:1.4468
--- kaffe/ChangeLog:1.4467 Mon Oct 3 19:35:43 2005
+++ kaffe/ChangeLog Tue Oct 18 21:23:23 2005
@@ -1,3 +1,14 @@
+2005-10-18 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/scripts/Makefile.am:
+ Only install the javadoc wrapper script if gjdoc is being built.
+ Simplified conditionals.
+
+ Reported by: Petteri Raety <[EMAIL PROTECTED]>
+
+ * kaffe/scripts/compat/Makefile.am:
+ Simplified conditionals.
+
2005-10-03 Guilhem Lavaux <[EMAIL PROTECTED]>
* m4/binreloc.m4: Updated file.
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.14
kaffe/kaffe/scripts/Makefile.am:1.15
--- kaffe/kaffe/scripts/Makefile.am:1.14 Sat Apr 23 18:20:20 2005
+++ kaffe/kaffe/scripts/Makefile.am Tue Oct 18 21:23:24 2005
@@ -16,17 +16,19 @@
if SUN_COMPAT
SUBDIRS = compat
-SCRIPTFILES_COMPAT=
-else
+endif
+
+if COND_GJDOC
+KAFFE_JAVADOC = javadoc
+endif
+
if COND_NATIVE_AWT
KAFFE_APPLETVIEWER = appletviewer
-else
-# If no native AWT backends are enabled, the appletviewer
-# must be absent.
-KAFFE_APPLETVIEWER =
-endif
-SCRIPTFILES_COMPAT= $(KAFFE_APPLETVIEWER) javac javadoc
endif
+
+SCRIPTFILES_COMPAT= \
+ $(KAFFE_APPLETVIEWER) \
+ $(KAFFE_JAVADOC)
if ENABLE_XPROF
SCRIPTFILES_XPROF=kaffexprof nm2as.awk
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.180
kaffe/kaffe/scripts/Makefile.in:1.181
--- kaffe/kaffe/scripts/Makefile.in:1.180 Mon Oct 3 19:36:17 2005
+++ kaffe/kaffe/scripts/Makefile.in Tue Oct 18 21:23:24 2005
@@ -384,12 +384,12 @@
native2ascii rmic serialver
@[EMAIL PROTECTED] = compat
[EMAIL PROTECTED]@SCRIPTFILES_COMPAT = $(KAFFE_APPLETVIEWER) javac javadoc
[EMAIL PROTECTED]@SCRIPTFILES_COMPAT =
-# If no native AWT backends are enabled, the appletviewer
-# must be absent.
[EMAIL PROTECTED]@@[EMAIL PROTECTED] =
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = appletviewer
[EMAIL PROTECTED]@KAFFE_JAVADOC = javadoc
[EMAIL PROTECTED]@KAFFE_APPLETVIEWER = appletviewer
+SCRIPTFILES_COMPAT = \
+ $(KAFFE_APPLETVIEWER) \
+ $(KAFFE_JAVADOC)
+
@[EMAIL PROTECTED] =
@[EMAIL PROTECTED] = kaffexprof nm2as.awk
PSCRIPTFILES = install-jar
Index: kaffe/kaffe/scripts/compat/Makefile.am
diff -u kaffe/kaffe/scripts/compat/Makefile.am:1.4
kaffe/kaffe/scripts/compat/Makefile.am:1.5
--- kaffe/kaffe/scripts/compat/Makefile.am:1.4 Sun Oct 2 15:11:21 2005
+++ kaffe/kaffe/scripts/compat/Makefile.am Tue Oct 18 21:23:25 2005
@@ -9,9 +9,6 @@
if SUN_COMPAT
jrebin_SCRIPTS = java
bin_SCRIPTS = javac
-else
-jrebin_SCRIPTS=
-bin_SCRIPTS=
endif
install-exec-local:
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.159
kaffe/kaffe/scripts/compat/Makefile.in:1.160
--- kaffe/kaffe/scripts/compat/Makefile.in:1.159 Mon Oct 3 19:36:19 2005
+++ kaffe/kaffe/scripts/compat/Makefile.in Tue Oct 18 21:23:25 2005
@@ -363,9 +363,7 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
[EMAIL PROTECTED]@jrebin_SCRIPTS =
@[EMAIL PROTECTED] = java
[EMAIL PROTECTED]@bin_SCRIPTS =
@[EMAIL PROTECTED] = javac
all: all-am
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
