From: Michael Jeanson <mjeanson@gmail.com>
Date: Wed, 13 Nov 2013 17:21:47 +0000 (-0500)
Subject: Fix: package of LTTngUst.h was renamed without renaming target in makefile
X-Git-Tag: v2.4.0-rc1~18
X-Git-Url: https://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=f7e770b846eb5b661edc4f0f11d2ad4851fd45ba

Fix: package of LTTngUst.h was renamed without renaming target in makefile

Signed-off-by: Michael Jeanson <mjeanson@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am
index 22ba89c3..ac3d5217 100644
--- a/liblttng-ust-jul/Makefile.am
+++ b/liblttng-ust-jul/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttng-ust-jul-jni.la
 liblttng_ust_jul_jni_la_SOURCES = LTTngUst.c lttng_ust_jul.h
-nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_LTTngUst.h
+nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_jul_LTTngUst.h
 dist_noinst_DATA = $(LTTNG_JUL_SRCDIR)/LTTngUst.java
 liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
@@ -18,14 +18,14 @@ JCC=javac
 endif
 
 all-local: $(LTTNG_JUL_DESTDIR)/LTTngAgent.class $(LTTNG_JUL_DESTDIR)/LTTngUst.class \
-		org_lttng_ust_LTTngUst.h liblttng-ust-jul.jar
+		org_lttng_ust_jul_LTTngUst.h liblttng-ust-jul.jar
 
 clean-local:
 	rm -f org_lttng_ust_jul_LTTngUst.h
 	rm -f liblttng-ust-jul.jar
 	rm -f org/lttng/ust/jul/*.class
 
-LTTngUst.c: org_lttng_ust_LTTngUst.h
+LTTngUst.c: org_lttng_ust_jul_LTTngUst.h
 
 $(LTTNG_JUL_DESTDIR)/LTTngUst.class: $(LTTNG_JUL_SRCDIR)/LTTngUst.java
 	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngUst.java"
@@ -33,7 +33,7 @@ $(LTTNG_JUL_DESTDIR)/LTTngUst.class: $(LTTNG_JUL_SRCDIR)/LTTngUst.java
 $(LTTNG_JUL_DESTDIR)/LTTngAgent.class: $(LTTNG_JUL_SRCDIR)/LTTngAgent.java
 	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngAgent.java"
 
-org_lttng_ust_LTTngUst.h: $(LTTNG_JUL_DESTDIR)/LTTngUst.class
+org_lttng_ust_jul_LTTngUst.h: $(LTTNG_JUL_DESTDIR)/LTTngUst.class
 	$(JCC)/javah org.lttng.ust.jul.LTTngUst
 
 liblttng-ust-jul.jar: $(LTTNG_JUL_DESTDIR)/LTTngUst.class $(LTTNG_JUL_DESTDIR)/LTTngAgent.class