X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=56d6230c9f8478467f46e874fa012216cd11df67;hb=edd28877cc74f9f0c063910d3cc24729db67f3f4;hp=ef4d4b33f80a195a8e04dc04c76b791641590ab8;hpb=17bfaca62aaacec71c6da4bd927af051727593b6;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index ef4d4b33..56d6230c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,12 +42,12 @@ libsigrok_la_SOURCES = \
 	src/std.c
 
 # Input modules
-#	src/input/binary.c \
-#	src/input/chronovu_la8.c \
-#	src/input/csv.c \
-#	src/input/vcd.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
 
 # Output modules
@@ -506,6 +506,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 $@ $<