From 5106f08be4a25c4e8ac09f206f1af19962995ce2 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 14 Feb 2019 14:15:39 -0500 Subject: [PATCH 1/1] Fix: java: stamp build dependency Signed-off-by: Mathieu Desnoyers --- liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am | 2 +- liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am | 2 +- liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am index ed551eb4..fad8284a 100644 --- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am +++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am @@ -55,7 +55,7 @@ if !HAVE_JAVAH # to generate the jni header file. AM_JAVACFLAGS = -h $(jnioutdir) else -context-jni-header.stamp: $(dist_noinst_JAVA) +context-jni-header.stamp: $(classes) $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(jnioutdir) $(JAVAHFLAGS) org.lttng.ust.agent.context.LttngContextApi && \ echo "Context API JNI header generated" > context-jni-header.stamp diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am index 99fa78cf..3eb325d5 100644 --- a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am +++ b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am @@ -31,7 +31,7 @@ if !HAVE_JAVAH # to generate the jni header file. AM_JAVACFLAGS = -h $(juljniout) else -jul-jni-header.stamp: $(dist_noinst_JAVA) +jul-jni-header.stamp: $(classes) $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \ echo "JUL JNI header generated" > jul-jni-header.stamp diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am index 0c9475a3..19d5bf86 100644 --- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am +++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am @@ -31,7 +31,7 @@ if !HAVE_JAVAH # to generate the jni header file. AM_JAVACFLAGS = -h $(log4jjniout) else -log4j-jni-header.stamp: $(dist_noinst_JAVA) +log4j-jni-header.stamp: $(classes) $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \ echo "Log4j JNI header generated" > log4j-jni-header.stamp -- 2.11.0