Add M4 macros helpers to build Java programs

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

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index e52bf0e2a27937b9c5bf5ab6c28a696790d4c740..c66dd79c32b17d408ff481b4d1bea5cc527ab648 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,16 +1,17 @@
+LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust
+LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
+
 if BUILD_JNI_INTERFACE
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir) -I$(top_builddir)/include
 
+BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 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
 dist_noinst_DATA = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust
-LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
-
 if HAVE_JAVA_JDK
 JCC=$(JAVA_JDK)/bin
 else
@@ -24,10 +25,8 @@ clean-local:
        rm -f liblttng-ust-java.jar
        rm -rf org/lttng/ust/*.class
 
-LTTngUst.c: org_lttng_ust_LTTngUst.h
-
-$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_DESTDIR)/LTTngUst.java
-       $(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_DESTDIR)/LTTngUst.java"
+$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_SRCDIR)/LTTngUst.java
+       $(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_SRCDIR)/LTTngUst.java"
 
 org_lttng_ust_LTTngUst.h: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
        $(JCC)/javah org.lttng.ust.LTTngUst