Cleanup: standardise include path

[lttng-ust.git] / liblttng-ust-java / Makefile.am

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 260774f972c81540854b9d20828be9651341f7d2..dc4bbc68d8938c9b23a270c615d5bfc0bb310efc 100644 (file)
--- 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
@@ -33,4 +34,6 @@ endif
 
 all-local: org_lttng_ust_LTTngUst.h
 
+EXTRA_DIST = README
+
 CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h