X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=dc4bbc68d8938c9b23a270c615d5bfc0bb310efc;hb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;hp=4975b8b0989801052d1486c9e2a403aaebb13d7d;hpb=e6e508c974088acd37ab97753632745f30eabe3e;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 4975b8b0..dc4bbc68 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -7,12 +7,13 @@ dist_noinst_JAVA = $(pkgpath)/LTTngUst.java
 jar_DATA = $(jarfile)
 BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
+AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
 lib_LTLIBRARIES = liblttng-ust-java.la
 liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
 nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
 
-liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
+liblttng_ust_java_la_LIBADD = -lc \
+	$(top_builddir)/liblttng-ust/liblttng-ust.la
 
 $(jarfile): classnoinst.stamp
 	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class