X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=44bc959877d11b7e5e79a87d13125389dec259c7;hb=3532ed01256b986ecaf37ea5bb29d81465e2aa89;hp=5e1b0e2b157db66edac5cd7d3c40e4b9fce182b5;hpb=3db4b08b2d2536e86cf0f120100f0334ae25b336;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 5e1b0e2b..44bc9598 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 \
@@ -98,7 +99,8 @@ libsigrok_la_SOURCES += \
 	src/dmm/fs9922.c \
 	src/dmm/m2110.c \
 	src/dmm/metex14.c \
-	src/dmm/rs9lcd.c
+	src/dmm/rs9lcd.c \
+	src/dmm/bm25x.c
 
 # Hardware drivers
 if HW_AGILENT_DMM
@@ -406,23 +408,23 @@ library_include_HEADERS += \
 
 pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
 
-bindings/cxx/libsigrok.xml: include/libsigrok/libsigrok.h
-	$(AM_V_GEN)gccxml $(CFLAGS) -DGLIB_DISABLE_DEPRECATION_WARNINGS $< -fxml=$@
+doxy/xml/index.xml: include/libsigrok/libsigrok.h
+	$(AM_V_GEN)doxygen Doxyfile
 
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
 bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
 
-bindings/cxx/enums.timestamp: bindings/cxx/enums.py bindings/cxx/libsigrok.xml \
+bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \
 		bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
-	$(AM_V_GEN)python $<
+	$(AM_V_GEN)python $< doxy/xml/index.xml
 	$(AM_V_at)touch $@
 
 bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
 		$(library_include_HEADERS)
 
 cxx-clean:
-	rm -f bindings/cxx/libsigrok.xml
+	rm -rf doxy/
 	rm -f bindings/cxx/enums.cpp
 	rm -f bindings/cxx/include/libsigrok/enums.hpp
 	rm -f bindings/cxx/enums.timestamp
@@ -438,11 +440,11 @@ PDIR = bindings/python
 python-build: $(PDIR)/timestamp
 
 python-quietclean:
-	$(AM_V_at)python $(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
+	$(AM_V_at)cd $(PDIR) && python setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
 		| grep -v "can.t clean it"; true
 
 $(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
-		$(library_include_HEADERS)
+		bindings/swig/classes.i $(library_include_HEADERS)
 	$(AM_V_at)$(MAKE) python-quietclean
 	$(AM_V_GEN)cd $(PDIR) && python setup.py --quiet build 3>&1 1>&2 2>&3 \
 		| grep -v "command line option.*Wstrict-prototypes"; true
@@ -464,28 +466,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 +497,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)