view scripts/java/module.mk @ 28061:8f5e625062f3

use %reldir% in more places in module.mk files in scripts directory * scripts/+containers/module.mk, scripts/+matlab/+lang/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/legacy/module.mk, scripts/linear-algebra/module.mk, scripts/miscellaneous/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/module.mk, scripts/strings/module.mk, scripts/testfun/module.mk, scripts/time/module.mk, scripts/web/module.mk: Use %reldir% instead of literal directory name where possbile. Ensure that all private directories are included in FCN_FILE_DIRS list.
author John W. Eaton <jwe@octave.org>
date Thu, 13 Feb 2020 11:33:27 -0500
parents 5701a3716577
children 0089f0213384
line wrap: on
line source

FCN_FILE_DIRS += %reldir%

%canon_reldir%_FCN_FILES = \
  %reldir%/javaArray.m \
  %reldir%/java_get.m \
  %reldir%/java_set.m \
  %reldir%/javaaddpath.m \
  %reldir%/javachk.m \
  %reldir%/javaclasspath.m \
  %reldir%/javamem.m \
  %reldir%/javarmpath.m \
  %reldir%/usejava.m

if AMCOND_HAVE_JAVA
%canon_reldir%_JAR_FILES = %reldir%/octave.jar

JAR_FILES += $(%canon_reldir%_JAR_FILES)
endif

org_octave_dir = org/octave

if AMCOND_HAVE_JAVA
JAVA_SRC = \
  $(org_octave_dir)/ClassHelper.java \
  $(org_octave_dir)/Matrix.java \
  $(org_octave_dir)/OctClassLoader.java \
  $(org_octave_dir)/Octave.java \
  $(org_octave_dir)/OctaveReference.java
endif

JAVA_CLASSES = $(JAVA_SRC:.java=.class)

%canon_reldir%_JAVA_SRC = $(addprefix %reldir%/, $(JAVA_SRC))

%canon_reldir%_JAVA_CLASSES = $(addprefix %reldir%/, $(JAVA_CLASSES))

OCT_V_JAR = $(oct__v_JAR_$(V))
oct__v_JAR_ = $(oct__v_JAR_$(AM_DEFAULT_VERBOSITY))
oct__v_JAR_0 = @echo "  JAR     " $@;
oct__v_JAR_1 =

OCT_V_JAVAC = $(oct__v_JAVAC_$(V))
oct__v_JAVAC_ = $(oct__v_JAVAC_$(AM_DEFAULT_VERBOSITY))
oct__v_JAVAC_0 = @echo "  JAVAC   " $@;
oct__v_JAVAC_1 =

$(%canon_reldir%_JAVA_CLASSES) : %.class : %.java | %reldir%/$(octave_dirstamp)
	$(OCT_V_JAVAC)$(MKDIR_P) %reldir%/$(org_octave_dir) && \
	( cd $(srcdir)/scripts/java; \
	  "$(JAVAC)" -source 8 -target 8 -Xlint:-options \
	             -d $(abs_top_builddir)/scripts/java \
	             $(org_octave_dir)/$(<F) )

if AMCOND_HAVE_JAVA
%reldir%/octave.jar: $(%canon_reldir%_JAVA_CLASSES)
	$(OCT_V_JAR)rm -f $@-t $@ && \
	( cd scripts/java; \
	  "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \
	mv $@-t $@
endif

%canon_reldir%dir = $(fcnfiledir)/java

%canon_reldir%_DATA = \
  $(%canon_reldir%_FCN_FILES) \
  $(%canon_reldir%_JAR_FILES)

FCN_FILES += $(%canon_reldir%_FCN_FILES)

PKG_ADD_FILES += %reldir%/PKG_ADD

DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)

scripts_EXTRA_DIST += \
  $(%canon_reldir%_JAVA_SRC)

scripts_CLEANFILES += \
  $(%canon_reldir%_JAR_FILES) \
  $(%canon_reldir%_JAVA_CLASSES)