Mercurial > octave

diff scripts/java/module.mk @ 20328: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
line wrap: on
line diff
--- a/scripts/java/module.mk	Fri Jul 10 13:28:33 2015 -0400
+++ b/scripts/java/module.mk	Fri Jul 10 14:40:47 2015 -0400
@@ -1,24 +1,24 @@
-FCN_FILE_DIRS += java
+FCN_FILE_DIRS += scripts/java
 
-java_FCN_FILES = \
-  java/java_get.m \
-  java/java_set.m \
-  java/javaArray.m \
-  java/javaaddpath.m \
-  java/javachk.m \
-  java/javaclasspath.m \
-  java/javamem.m \
-  java/javarmpath.m \
-  java/usejava.m
+scripts_java_FCN_FILES = \
+  scripts/java/java_get.m \
+  scripts/java/java_set.m \
+  scripts/java/javaArray.m \
+  scripts/java/javaaddpath.m \
+  scripts/java/javachk.m \
+  scripts/java/javaclasspath.m \
+  scripts/java/javamem.m \
+  scripts/java/javarmpath.m \
+  scripts/java/usejava.m
 
-FCN_FILES += $(java_FCN_FILES)
+FCN_FILES += $(scripts_java_FCN_FILES)
 
-PKG_ADD_FILES += java/PKG_ADD
+PKG_ADD_FILES += scripts/java/PKG_ADD
 
-DIRSTAMP_FILES += java/$(octave_dirstamp)
+DIRSTAMP_FILES += scripts/java/$(octave_dirstamp)
 
 if AMCOND_HAVE_JAVA
-JAR_FILES += java/octave.jar
+JAR_FILES += scripts/java/octave.jar
 endif
 
 org_octave_dir = org/octave
@@ -45,36 +45,36 @@
   $(org_octave_dir)/images/information.png \
   $(org_octave_dir)/images/octave.png
 
-java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC))
+scripts_java_JAVA_SRC = $(addprefix scripts/java/, $(JAVA_SRC))
 
-java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES))
+scripts_java_JAVA_CLASSES = $(addprefix scripts/java/, $(JAVA_CLASSES))
 
-java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES))
+scripts_java_JAVA_IMAGES = $(addprefix scripts/java/, $(JAVA_IMAGES))
 
-srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES))
+srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES))
 
 %.class : %.java
-	$(AM_V_GEN)$(MKDIR_P) java/$(org_octave_dir) && \
-	( cd $(srcdir)/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) )
+	$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
+	( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
 
-java/images.stamp: $(srcdir_java_JAVA_IMAGES)
+scripts/java/images.stamp: $(srcdir_scripts_java_JAVA_IMAGES)
 	$(AM_V_GEN)if [ "x$(srcdir)" != "x." ]; then \
-	  $(MKDIR_P) java/$(org_octave_dir)/images; \
-	  cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \
+	  $(MKDIR_P) scripts/java/$(org_octave_dir)/images; \
+	  cp $(srcdir_scripts_java_JAVA_IMAGES) scripts/java/$(org_octave_dir)/images; \
 	fi && \
 	touch $@
 
 if AMCOND_HAVE_JAVA
-java/octave.jar: java/images.stamp $(java_JAVA_CLASSES)
+scripts/java/octave.jar: scripts/java/images.stamp $(scripts_java_JAVA_CLASSES)
 	$(AM_V_GEN)rm -f $@-t $@ && \
-	( cd java; \
+	( cd scripts/java; \
 	  "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \
 	mv $@-t $@
 endif
 
-EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)
+EXTRA_DIST += $(JAR_FILES) $(scripts_java_JAVA_SRC) $(scripts_java_JAVA_IMAGES)
 
-CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES)
+CLEANFILES += $(JAR_FILES) $(scripts_java_JAVA_CLASSES)
 
-DISTCLEANFILES += java/images.stamp
+DISTCLEANFILES += scripts/java/images.stamp