X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8ffc99a94745a60c519b5f60d29c322b89339b78;hb=b866fc095d8f80621551af5b97102d630591f73b;hp=1168bf2074c1246584a702155d433766cb4e2910;hpb=ca5fdd96ba672c7dec9474f1b4ca6c553559f1fe;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 1168bf20..8ffc99a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ libsigrok_la_SOURCES += \
 	src/output/binary.c \
 	src/output/csv.c \
 	src/output/chronovu_la8.c \
+	src/output/wav.c \
 	src/output/gnuplot.c \
 	src/output/hex.c \
 	src/output/ols.c \
@@ -464,28 +465,29 @@ endif
 if BINDINGS_JAVA
 
 JDIR = bindings/java
-JPKG = org/sigrok/core/classes
-JINT = $(JDIR)/$(JPKG)/classes.i
-JSRC = $(JDIR)/$(JPKG)/classes_wrap.cxx
+JPKG = org/sigrok/core
+JCLS = $(JDIR)/$(JPKG)/classes
+JINT = $(JDIR)/$(JPKG)/interfaces
+JSRC = $(JCLS)/*.java $(JINT)/*.java
+JSWG = $(JCLS)/classes.i
+JCXX = $(JCLS)/classes_wrap.cxx
 JLIB = $(JDIR)/libsigrok_java_core_classes.so
 JJAR = $(JDIR)/sigrok-core.jar
 
 java-build: $(JJAR) $(JLIB)
 
-$(JSRC): $(JINT) bindings/swig/classes.i $(library_include_HEADERS)
+$(JCXX): $(JSWG) bindings/swig/classes.i $(library_include_HEADERS)
 	$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
-		-Iinclude -Ibindings/cxx/include \
-		-outdir $(JDIR)/$(JPKG) $(JINT)
+		-Iinclude -Ibindings/cxx/include -outdir $(JCLS) $(JSWG)
 
-$(JJAR): $(JSRC) $(JDIR)/$(JPKG)/*.java
-	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
+$(JJAR): $(JCXX)
+	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JSRC)
 	$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
-$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
+$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
 	$(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
-		-fno-strict-aliasing -fPIC -shared \
-		$(JDIR)/$(JPKG)/classes_wrap.cxx -lsigrokxx \
-		-o $(JLIB)
+		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
+		-lsigrokxx -o $(JLIB)
 
 java-install:
 	$(INSTALL) -d $(libdir)/jni
@@ -494,8 +496,10 @@ java-install:
 	$(INSTALL) $(JJAR) -t $(datadir)/java
 
 java-clean:
-	rm -f $(JSRC)
-	rm -f $(JDIR)/$(JPKG)/*.class
+	rm -f $(JCXX)
+	rm -f $(JCLS)/*.java
+	rm -f $(JCLS)/*.class
+	rm -f $(JINT)/*.class
 	rm -f $(JJAR)
 	rm -f $(JLIB)