X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=73a67b9358ff58f8402d2eb8f8d4a12637112667;hb=e8779db70cfe53db1d9f1f6ad00c4888ccf09b23;hp=0dd995d526102e902a5764ffeb23d89214f65fac;hpb=41d214f61a1683fca49b9dc687045afc2ce42007;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 0dd995d5..73a67b93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,11 +42,10 @@ libsigrok_la_SOURCES = \
 	src/std.c
 
 # Input modules
-#	src/input/binary.c \
-#	src/input/chronovu_la8.c \
-#
 libsigrok_la_SOURCES += \
 	src/input/input.c \
+	src/input/binary.c \
+	src/input/chronovu_la8.c \
 	src/input/csv.c \
 	src/input/vcd.c \
 	src/input/wav.c
@@ -333,6 +332,14 @@ libsigrok_la_SOURCES += \
 	src/hardware/victor-dmm/protocol.c \
 	src/hardware/victor-dmm/api.c
 endif
+if HW_YOKOGAWA_DLM
+libsigrok_la_SOURCES += \
+	src/hardware/yokogawa-dlm/protocol.h \
+	src/hardware/yokogawa-dlm/protocol.c \
+	src/hardware/yokogawa-dlm/protocol_wrappers.h \
+	src/hardware/yokogawa-dlm/protocol_wrappers.c \
+	src/hardware/yokogawa-dlm/api.c
+endif
 if HW_ZEROPLUS_LOGIC_CUBE
 libsigrok_la_SOURCES += \
 	src/hardware/zeroplus-logic-cube/analyzer.c \
@@ -507,6 +514,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
 	$(AM_V_GEN)python $< java $(CPPXMLDOC) > $@
 
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
+	$(AM_V_at)make java-clean
 	$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
 		-I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
 
@@ -515,7 +523,7 @@ $(JJAR): $(JCXX)
 	$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
 $(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
-	$(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
+	$(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \
 		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
 		-lsigrokxx -o $(JLIB)
 
@@ -526,13 +534,13 @@ java-install:
 	$(INSTALL) $(JJAR) -t $(datadir)/java
 
 java-clean:
-	rm -f $(JCXX)
-	rm -f $(JCLS)/*.java
-	rm -f $(JCLS)/*.class
-	rm -f $(JINT)/*.class
-	rm -f $(JJAR)
-	rm -f $(JLIB)
-	rm -rf $(JDIR)/doxy/
+	$(AM_V_at)rm -f $(JCXX)
+	$(AM_V_at)rm -f $(JCLS)/*.java
+	$(AM_V_at)rm -f $(JCLS)/*.class
+	$(AM_V_at)rm -f $(JINT)/*.class
+	$(AM_V_at)rm -f $(JJAR)
+	$(AM_V_at)rm -f $(JLIB)
+	$(AM_V_at)rm -rf $(JDIR)/doxy/
 
 java-doc:
 	$(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR=$(abs_builddir)/$(JDIR)/ doxygen Doxyfile 2>/dev/null