Slight simplification of test-suite build for new out-of-source changes

Provide default SRCDIR and SCRIPTDIR variables in common.mk and override
only where needed.
This commit is contained in:
William S Fulton 2014-05-13 23:30:00 +01:00
commit 2b5499a262
25 changed files with 9 additions and 134 deletions

View file

@ -6,17 +6,11 @@ LANGUAGE = java
JAVA = @JAVA@
JAVAC = @JAVAC@
JAVAFLAGS = -Xcheck:jni
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.java
srcdir = @srcdir@
top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@
ifeq (.,$(srcdir))
SRCDIR = ../
else
SRCDIR = ../$(srcdir)/
endif
C_TEST_CASES = \
java_lib_arrays \
@ -49,6 +43,7 @@ CPP_TEST_CASES = \
include $(srcdir)/../common.mk
# Overridden variables here
SRCDIR = ../$(srcdir)/
JAVA_PACKAGE = $*
JAVA_PACKAGEOPT = -package $(JAVA_PACKAGE)
SWIGOPT += $(JAVA_PACKAGEOPT)