Mercurial > hg > octave-nkf
annotate scripts/java/module.mk @ 20538:fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
* scripts/module.mk: New file created from scripts/Makefile.am
* scripts/Makefile.am: Delete.
* Makefile.am (SUBDIRS): Remove scripts from the list.
* configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile from the list.
* doc/interpreter/images.awk, doc/module.mk, etc/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/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/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: Update for
non-recursive build.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 10 Jul 2015 14:40:47 -0400 |
parents | 4f6ae6b94abe |
children | 7ddee729f29e |
rev | line source |
---|---|
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
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 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
3 scripts_java_FCN_FILES = \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
4 scripts/java/java_get.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
5 scripts/java/java_set.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
6 scripts/java/javaArray.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
7 scripts/java/javaaddpath.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
8 scripts/java/javachk.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
9 scripts/java/javaclasspath.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
10 scripts/java/javamem.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
11 scripts/java/javarmpath.m \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
12 scripts/java/usejava.m |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
14 FCN_FILES += $(scripts_java_FCN_FILES) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
16 PKG_ADD_FILES += scripts/java/PKG_ADD |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
18 DIRSTAMP_FILES += scripts/java/$(octave_dirstamp) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
20 if AMCOND_HAVE_JAVA |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
21 JAR_FILES += scripts/java/octave.jar |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
22 endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 org_octave_dir = org/octave |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
26 if AMCOND_HAVE_JAVA |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 JAVA_SRC = \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 $(org_octave_dir)/ClassHelper.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 $(org_octave_dir)/OctClassLoader.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 $(org_octave_dir)/Octave.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 $(org_octave_dir)/OctaveReference.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 $(org_octave_dir)/Matrix.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 $(org_octave_dir)/JDialogBox.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 $(org_octave_dir)/DlgListener.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 $(org_octave_dir)/TeXtranslator.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 $(org_octave_dir)/TeXcode.java |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
37 endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 JAVA_CLASSES = $(JAVA_SRC:.java=.class) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 JAVA_IMAGES = \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 $(org_octave_dir)/images/question.png \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 $(org_octave_dir)/images/error.png \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 $(org_octave_dir)/images/warning.png \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 $(org_octave_dir)/images/information.png \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 $(org_octave_dir)/images/octave.png |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
48 scripts_java_JAVA_SRC = $(addprefix scripts/java/, $(JAVA_SRC)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
50 scripts_java_JAVA_CLASSES = $(addprefix scripts/java/, $(JAVA_CLASSES)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
52 scripts_java_JAVA_IMAGES = $(addprefix scripts/java/, $(JAVA_IMAGES)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
54 srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 %.class : %.java |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
57 $(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
58 ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -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
|
59 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
60 scripts/java/images.stamp: $(srcdir_scripts_java_JAVA_IMAGES) |
19997
4f6ae6b94abe
make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents:
19101
diff
changeset
|
61 $(AM_V_GEN)if [ "x$(srcdir)" != "x." ]; then \ |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
62 $(MKDIR_P) scripts/java/$(org_octave_dir)/images; \ |
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
63 cp $(srcdir_scripts_java_JAVA_IMAGES) scripts/java/$(org_octave_dir)/images; \ |
19997
4f6ae6b94abe
make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents:
19101
diff
changeset
|
64 fi && \ |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
65 touch $@ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
66 |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
67 if AMCOND_HAVE_JAVA |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
68 scripts/java/octave.jar: scripts/java/images.stamp $(scripts_java_JAVA_CLASSES) |
19997
4f6ae6b94abe
make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents:
19101
diff
changeset
|
69 $(AM_V_GEN)rm -f $@-t $@ && \ |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
70 ( cd scripts/java; \ |
19997
4f6ae6b94abe
make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents:
19101
diff
changeset
|
71 "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \ |
4f6ae6b94abe
make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents:
19101
diff
changeset
|
72 mv $@-t $@ |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
73 endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
74 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
75 EXTRA_DIST += $(JAR_FILES) $(scripts_java_JAVA_SRC) $(scripts_java_JAVA_IMAGES) |
15737
71dfd53ed47a
build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
76 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
77 CLEANFILES += $(JAR_FILES) $(scripts_java_JAVA_CLASSES) |
15737
71dfd53ed47a
build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
78 |
20538
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19997
diff
changeset
|
79 DISTCLEANFILES += scripts/java/images.stamp |
15737
71dfd53ed47a
build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
80 |