projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test: java-jul:missing static test files for dist and out of tree build
[lttng-tools.git]
/
tests
/
regression
/
ust
/
java-jul
/
Makefile.am
diff --git
a/tests/regression/ust/java-jul/Makefile.am
b/tests/regression/ust/java-jul/Makefile.am
index 7d713a9a5d1a8c428a72bcac13d90fc3bbbc2814..c9f4f3df1bcbd0d893223e9d9ac44b6f6d225512 100644
(file)
--- a/
tests/regression/ust/java-jul/Makefile.am
+++ b/
tests/regression/ust/java-jul/Makefile.am
@@
-1,7
+1,5
@@
-if BUILD_JAVA_JUL
-
-noinst_SCRIPTS = test_java_jul
-EXTRA_DIST = test_java_jul
+noinst_SCRIPTS = test_java_jul JTestLTTng.java
+EXTRA_DIST = test_java_jul JTestLTTng.java
if HAVE_JAVA_JDK
JCC=$(JAVA_JDK)/bin/javac
if HAVE_JAVA_JDK
JCC=$(JAVA_JDK)/bin/javac
@@
-11,14
+9,17
@@
endif
JUL_JAR_FILE=$(java_jul_jar_path)
JUL_JAR_FILE=$(java_jul_jar_path)
-all-local: JTestLTTng.class
+# Still need to copy test files in case of out of tree build
+if BUILD_JAVA_JUL
+all-local: static_file JTestLTTng.class
%.class: %.java
$(JCC) -d "$(builddir)" -cp "$(JUL_JAR_FILE):." $<
%.class: %.java
$(JCC) -d "$(builddir)" -cp "$(JUL_JAR_FILE):." $<
+else
+all-local: static_file
+endif #BUILD_JAVA_JUL
-JTestLTTng.class: JTestLTTng.java
-
-all-local:
+static_file:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
for script in $(EXTRA_DIST); do \
cp -f $(srcdir)/$$script $(builddir); \
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
for script in $(EXTRA_DIST); do \
cp -f $(srcdir)/$$script $(builddir); \
@@
-32,5
+33,3
@@
clean-local:
rm -f $(builddir)/$$script; \
done; \
fi
rm -f $(builddir)/$$script; \
done; \
fi
-
-endif # BUILD_JAVA_JUL
This page took
0.024939 seconds
and
4
git commands to generate.