Mercurial > octave

annotate scripts/java/module.mk @ 23495:8308417aff1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use automake %reldir% feature * configure.ac (AM_INIT_AUTOMAKE): Require automake 1.14. * doc/doxyhtml/module.mk, doc/interpreter/module.mk, doc/liboctave/module.mk, doc/module.mk, doc/refcard/module.mk, etc/module.mk, examples/module.mk, libgui/graphics/module.mk, libgui/module.mk, libgui/src/module.mk, libinterp/corefcn/module.mk, libinterp/dldfcn/config-module.awk, libinterp/module.mk, libinterp/octave-value/module.mk, libinterp/operators/module.mk, libinterp/parse-tree/module.mk, libinterp/template-inst/module.mk, liboctave/array/module.mk, liboctave/external/Faddeeva/module.mk, liboctave/external/amos/module.mk, liboctave/external/blas-xtra/module.mk, liboctave/external/daspk/module.mk, liboctave/external/dasrt/module.mk, liboctave/external/dassl/module.mk, liboctave/external/fftpack/module.mk, liboctave/external/lapack-xtra/module.mk, liboctave/external/module.mk, liboctave/external/odepack/module.mk, liboctave/external/ordered-qz/module.mk, liboctave/external/quadpack/module.mk, liboctave/external/ranlib/module.mk, liboctave/external/slatec-err/module.mk, liboctave/external/slatec-fn/module.mk, liboctave/module.mk, liboctave/numeric/module.mk, liboctave/operators/module.mk, liboctave/system/module.mk, liboctave/util/module.mk, liboctave/wrappers/module.mk, m4/module.mk, scripts/+containers/module.mk, scripts/@ftp/module.mk, scripts/audio/module.mk, scripts/deprecated/module.mk, scripts/elfun/module.mk, scripts/general/module.mk, scripts/geometry/module.mk, scripts/gui/module.mk, scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk, scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk, scripts/module.mk, scripts/ode/module.mk, scripts/optimization/module.mk, scripts/path/module.mk, scripts/pkg/module.mk, scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk, scripts/plot/util/module.mk, scripts/polynomial/module.mk, scripts/prefs/module.mk, scripts/profiler/module.mk, scripts/set/module.mk, scripts/signal/module.mk, scripts/sparse/module.mk, scripts/specfun/module.mk, scripts/special-matrix/module.mk, scripts/startup/module.mk, scripts/statistics/base/module.mk, scripts/statistics/distributions/module.mk, scripts/statistics/models/module.mk, scripts/statistics/tests/module.mk, scripts/strings/module.mk, scripts/testfun/module.mk, scripts/time/module.mk, src/module.mk, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-41723/module.mk, test/bug-44940/module.mk, test/bug-46660/module.mk, test/bug-50014/module.mk, test/bug-50035/module.mk, test/bug-50716/module.mk, test/class-concat/module.mk, test/classdef-multiple-inheritance/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, test/module.mk, test/nest/module.mk, test/publish/module.mk: Use %reldir% and %canon_reldir% where possible.
author John W. Eaton <jwe@octave.org>
date Mon, 15 May 2017 16:17:58 -0400
parents b5d9b95d1e1a
children dc3745744aef
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20328
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
1 FCN_FILE_DIRS += scripts/java
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
3 %canon_reldir%_FCN_FILES = \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
4 %reldir%/java_get.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
5 %reldir%/java_set.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
6 %reldir%/javaArray.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
7 %reldir%/javaaddpath.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
8 %reldir%/javachk.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
9 %reldir%/javaclasspath.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
10 %reldir%/javamem.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
11 %reldir%/javarmpath.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
12 %reldir%/usejava.m
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
14 if AMCOND_HAVE_JAVA
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
15 %canon_reldir%_JAR_FILES = %reldir%/octave.jar
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
17 JAR_FILES += $(%canon_reldir%_JAR_FILES)
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
18 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 org_octave_dir = org/octave
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
22 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 JAVA_SRC = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 $(org_octave_dir)/ClassHelper.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 $(org_octave_dir)/OctClassLoader.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 $(org_octave_dir)/Octave.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 $(org_octave_dir)/OctaveReference.java \
21630
b5d9b95d1e1a Removing Java dialog boxes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 21154
diff changeset
28 $(org_octave_dir)/Matrix.java
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
29 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
33 %canon_reldir%_JAVA_SRC = $(addprefix %reldir%/, $(JAVA_SRC))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
35 %canon_reldir%_JAVA_CLASSES = $(addprefix %reldir%/, $(JAVA_CLASSES))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
37 $(%canon_reldir%_JAVA_CLASSES) : %.class : %.java | %reldir%/$(octave_dirstamp)
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
38 $(AM_V_GEN)$(MKDIR_P) %reldir%/$(org_octave_dir) && \
21154
36b27fac6bc9 build: Silence warnings about bootclasspath when compiling java scripts.
Rik <rik@octave.org>
parents: 21108
diff changeset
39 ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
41 if AMCOND_HAVE_JAVA
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
42 %reldir%/octave.jar: $(%canon_reldir%_JAVA_CLASSES)
19792
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 18911
diff changeset
43 $(AM_V_GEN)rm -f $@-t $@ && \
20328
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
44 ( cd scripts/java; \
21630
b5d9b95d1e1a Removing Java dialog boxes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 21154
diff changeset
45 "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \
19792
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 18911
diff changeset
46 mv $@-t $@
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
47 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
49 %canon_reldir%dir = $(fcnfiledir)/java
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
50
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
51 %canon_reldir%_DATA = \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
52 $(%canon_reldir%_FCN_FILES) \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
53 $(%canon_reldir%_JAR_FILES)
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
54
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
55 FCN_FILES += $(%canon_reldir%_FCN_FILES)
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
56
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
57 PKG_ADD_FILES += %reldir%/PKG_ADD
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
58
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
59 DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
60
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
61 scripts_EXTRA_DIST += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
62 $(%canon_reldir%_JAR_FILES) \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
63 $(%canon_reldir%_JAVA_SRC)
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
64
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
65 scripts_CLEANFILES += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
66 $(%canon_reldir%_JAR_FILES) \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
67 $(%canon_reldir%_JAVA_CLASSES)