Mercurial > hg > octave-nkf

comparison scripts/java/module.mk @ 20538:fa9fa6ab76f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
20537:0ce7d8303152 20538:fa9fa6ab76f0
1 FCN_FILE_DIRS += java 1 FCN_FILE_DIRS += scripts/java
2 2
3 java_FCN_FILES = \ 3 scripts_java_FCN_FILES = \
4 java/java_get.m \ 4 scripts/java/java_get.m \
5 java/java_set.m \ 5 scripts/java/java_set.m \
6 java/javaArray.m \ 6 scripts/java/javaArray.m \
7 java/javaaddpath.m \ 7 scripts/java/javaaddpath.m \
8 java/javachk.m \ 8 scripts/java/javachk.m \
9 java/javaclasspath.m \ 9 scripts/java/javaclasspath.m \
10 java/javamem.m \ 10 scripts/java/javamem.m \
11 java/javarmpath.m \ 11 scripts/java/javarmpath.m \
12 java/usejava.m 12 scripts/java/usejava.m
13 13
14 FCN_FILES += $(java_FCN_FILES) 14 FCN_FILES += $(scripts_java_FCN_FILES)
15 15
16 PKG_ADD_FILES += java/PKG_ADD 16 PKG_ADD_FILES += scripts/java/PKG_ADD
17 17
18 DIRSTAMP_FILES += java/$(octave_dirstamp) 18 DIRSTAMP_FILES += scripts/java/$(octave_dirstamp)
19 19
20 if AMCOND_HAVE_JAVA 20 if AMCOND_HAVE_JAVA
21 JAR_FILES += java/octave.jar 21 JAR_FILES += scripts/java/octave.jar
22 endif 22 endif
23 23
24 org_octave_dir = org/octave 24 org_octave_dir = org/octave
25 25
26 if AMCOND_HAVE_JAVA 26 if AMCOND_HAVE_JAVA
43 $(org_octave_dir)/images/error.png \ 43 $(org_octave_dir)/images/error.png \
44 $(org_octave_dir)/images/warning.png \ 44 $(org_octave_dir)/images/warning.png \
45 $(org_octave_dir)/images/information.png \ 45 $(org_octave_dir)/images/information.png \
46 $(org_octave_dir)/images/octave.png 46 $(org_octave_dir)/images/octave.png
47 47
48 java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC)) 48 scripts_java_JAVA_SRC = $(addprefix scripts/java/, $(JAVA_SRC))
49 49
50 java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES)) 50 scripts_java_JAVA_CLASSES = $(addprefix scripts/java/, $(JAVA_CLASSES))
51 51
52 java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES)) 52 scripts_java_JAVA_IMAGES = $(addprefix scripts/java/, $(JAVA_IMAGES))
53 53
54 srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES)) 54 srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES))
55 55
56 %.class : %.java 56 %.class : %.java
57 $(AM_V_GEN)$(MKDIR_P) java/$(org_octave_dir) && \ 57 $(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
58 ( cd $(srcdir)/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) ) 58 ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
59 59
60 java/images.stamp: $(srcdir_java_JAVA_IMAGES) 60 scripts/java/images.stamp: $(srcdir_scripts_java_JAVA_IMAGES)
61 $(AM_V_GEN)if [ "x$(srcdir)" != "x." ]; then \ 61 $(AM_V_GEN)if [ "x$(srcdir)" != "x." ]; then \
62 $(MKDIR_P) java/$(org_octave_dir)/images; \ 62 $(MKDIR_P) scripts/java/$(org_octave_dir)/images; \
63 cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \ 63 cp $(srcdir_scripts_java_JAVA_IMAGES) scripts/java/$(org_octave_dir)/images; \
64 fi && \ 64 fi && \
65 touch $@ 65 touch $@
66 66
67 if AMCOND_HAVE_JAVA 67 if AMCOND_HAVE_JAVA
68 java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) 68 scripts/java/octave.jar: scripts/java/images.stamp $(scripts_java_JAVA_CLASSES)
69 $(AM_V_GEN)rm -f $@-t $@ && \ 69 $(AM_V_GEN)rm -f $@-t $@ && \
70 ( cd java; \ 70 ( cd scripts/java; \
71 "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \ 71 "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \
72 mv $@-t $@ 72 mv $@-t $@
73 endif 73 endif
74 74
75 EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES) 75 EXTRA_DIST += $(JAR_FILES) $(scripts_java_JAVA_SRC) $(scripts_java_JAVA_IMAGES)
76 76
77 CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES) 77 CLEANFILES += $(JAR_FILES) $(scripts_java_JAVA_CLASSES)
78 78
79 DISTCLEANFILES += java/images.stamp 79 DISTCLEANFILES += scripts/java/images.stamp
80 80