beaglelogic: Implementation with soft triggers

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6a6668c12a59aa90d702b8673bec1b59534bc8a4..f1ac6ec31283e048e8c5dd34c325771e47aa50e6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,6 +124,12 @@ libsigrok_la_SOURCES += \
        hardware/atten-pps3xxx/protocol.c \
        hardware/atten-pps3xxx/api.c
 endif
+if HW_BEAGLELOGIC
+libsigrok_la_SOURCES += \
+       hardware/beaglelogic/protocol.h \
+       hardware/beaglelogic/protocol.c \
+       hardware/beaglelogic/api.c
+endif
 if HW_BRYMEN_BM86X
 libsigrok_la_SOURCES += \
        hardware/brymen-bm86x/protocol.h \
@@ -361,7 +367,7 @@ TESTS = tests/check_main
 check_PROGRAMS = ${TESTS}
 
 tests_check_main_SOURCES = \
-       libsigrok.h \
+       include/libsigrok/libsigrok.h \
        tests/lib.c \
        tests/lib.h \
        tests/check_main.c \
@@ -400,7 +406,7 @@ library_include_HEADERS += \
 pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
 
 bindings/cxx/libsigrok.xml: include/libsigrok/libsigrok.h
-       gccxml $(CFLAGS) -DGLIB_DISABLE_DEPRECATION_WARNINGS $< -fxml=$@
+       $(AM_V_GEN)gccxml $(CFLAGS) -DGLIB_DISABLE_DEPRECATION_WARNINGS $< -fxml=$@
 
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
@@ -408,8 +414,8 @@ bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
 
 bindings/cxx/enums.timestamp: bindings/cxx/enums.py bindings/cxx/libsigrok.xml \
                bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
-       python $<
-       touch $@
+       $(AM_V_GEN)python $<
+       $(AM_V_at)touch $@
 
 bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
                $(library_include_HEADERS)
@@ -430,18 +436,19 @@ PDIR = bindings/python
 
 python-build: $(PDIR)/timestamp
 
+python-cleanclean:
+       $(AM_V_at)cd $(PDIR) && python setup.py --quiet clean --all 2> >(grep -v "can't clean it")
+
 $(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
-               $(library_include_HEADERS)
-       cd $(PDIR) && python setup.py clean --all
-       cd $(PDIR) && python setup.py build
-       touch $(PDIR)/timestamp
+               $(library_include_HEADERS) python-cleanclean
+       $(AM_V_GEN)cd $(PDIR) && python setup.py --quiet build 2> >(grep -v "command line option.*Wstrict-prototypes")
+       $(AM_V_at)touch $(PDIR)/timestamp
 
 python-install:
-       cd $(PDIR) && python setup.py install --prefix $(prefix)
+       cd $(PDIR) && python setup.py --quiet install --prefix $(prefix)
 
-python-clean:
-       cd $(PDIR) && python setup.py clean --all
-       rm -f $(PDIR)/timestamp
+python-clean: python-cleanclean
+       $(AM_V_at)rm -f $(PDIR)/timestamp
 
 BUILD_EXTRA += python-build
 INSTALL_EXTRA += python-install
@@ -461,16 +468,16 @@ JJAR = $(JDIR)/sigrok-core.jar
 java-build: $(JJAR) $(JLIB)
 
 $(JSRC): $(JINT) bindings/swig/classes.i $(library_include_HEADERS)
-       swig -c++ -java -package org.sigrok.core.classes \
+       $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
                -Iinclude -Ibindings/cxx/include \
                -outdir $(JDIR)/$(JPKG) $(JINT)
 
 $(JJAR): $(JSRC) $(JDIR)/$(JPKG)/*.java
-       $(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
-       jar cf $(JJAR) -C $(JDIR) $(JPKG)
+       $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
+       $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
 $(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
-       $(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
+       $(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
                -fno-strict-aliasing -fPIC -shared \
                $(JDIR)/$(JPKG)/classes_wrap.cxx -lsigrokxx \
                -o $(JLIB)