Mercurial > octave-nkf
changeset 15778:2c6b00c03329
build: Build documentation correctly even without Java installed.
* scripts/Makefile.am: Remove AMCOND_HAVE_JAVA conditionals disabling
java directory build when Java not present.
* scripts/java/module.mk: Disable octave.jar and octave class compilation
when Java is not present.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 12 Dec 2012 20:19:28 -0800 |
| parents | b8bcb2c7f3e8 |
| children | 4456ad3d8a56 |
| files | scripts/Makefile.am scripts/java/module.mk |
| diffstat | 2 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/Makefile.am Wed Dec 12 16:03:46 2012 -0800 +++ b/scripts/Makefile.am Wed Dec 12 20:19:28 2012 -0800 @@ -52,9 +52,7 @@ include help/module.mk include image/module.mk include io/module.mk -if AMCOND_HAVE_JAVA include java/module.mk -endif include linear-algebra/module.mk include miscellaneous/module.mk include optimization/module.mk @@ -127,11 +125,9 @@ $(srcdir)/mk-pkg-add $(srcdir) $(io_FCN_FILES) -- $(io_GEN_FCN_FILES) > $@-t mv $@-t $@ -if AMCOND_HAVE_JAVA java/PKG_ADD: $(java_FCN_FILES) $(java_GEN_FCN_FILES) java/$(octave_dirstamp) mk-pkg-add $(srcdir)/mk-pkg-add $(srcdir) $(java_FCN_FILES) -- $(java_GEN_FCN_FILES) > $@-t mv $@-t $@ -endif linear-algebra/PKG_ADD: $(linear_algebra_FCN_FILES) $(linear_algebra_GEN_FCN_FILES) linear-algebra/$(octave_dirstamp) mk-pkg-add $(srcdir)/mk-pkg-add $(srcdir) $(linear_algebra_FCN_FILES) -- $(linear_algebra_GEN_FCN_FILES) > $@-t @@ -226,9 +222,7 @@ $(help_GEN_FCN_FILES): help/$(octave_dirstamp) $(image_GEN_FCN_FILES): image/$(octave_dirstamp) $(io_GEN_FCN_FILES): io/$(octave_dirstamp) -if AMCOND_HAVE_JAVA $(java_GEN_FCN_FILES): java/$(octave_dirstamp) -endif $(linear_algebra_GEN_FCN_FILES): linear-algebra/$(octave_dirstamp) $(miscellaneous_GEN_FCN_FILES): miscellaneous/$(octave_dirstamp) $(optimization_GEN_FCN_FILES): optimization/$(octave_dirstamp) @@ -278,11 +272,9 @@ io/$(octave_dirstamp): $(MKDIR_P) io : > io/$(octave_dirstamp) -if AMCOND_HAVE_JAVA java/$(octave_dirstamp): $(MKDIR_P) java : > java/$(octave_dirstamp) -endif linear-algebra/$(octave_dirstamp): $(MKDIR_P) linear-algebra : > linear-algebra/$(octave_dirstamp)
--- a/scripts/java/module.mk Wed Dec 12 16:03:46 2012 -0800 +++ b/scripts/java/module.mk Wed Dec 12 20:19:28 2012 -0800 @@ -24,10 +24,13 @@ DIRSTAMP_FILES += java/$(octave_dirstamp) +if AMCOND_HAVE_JAVA JAR_FILES += java/octave.jar +endif org_octave_dir = org/octave +if AMCOND_HAVE_JAVA JAVA_SRC = \ $(org_octave_dir)/ClassHelper.java \ $(org_octave_dir)/OctClassLoader.java \ @@ -38,6 +41,7 @@ $(org_octave_dir)/DlgListener.java \ $(org_octave_dir)/TeXtranslator.java \ $(org_octave_dir)/TeXcode.java +endif JAVA_CLASSES = $(JAVA_SRC:.java=.class) @@ -67,9 +71,11 @@ fi touch $@ +if AMCOND_HAVE_JAVA java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) ( cd java; $(JAR) cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) ) mv $@.t $@ +endif EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)