Remove unnecessary std_serial_dev_acquisition_stop() wrappers

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5db56f9e23af2bf227953fce5d6ca996fc0cb218..58842e9bfad8c25dd79dc66820e9023fcdf04824 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ libsigrok_la_SOURCES = \
        src/session.c \
        src/session_file.c \
        src/session_driver.c \
-       src/drivers.c \
        src/hwdriver.c \
        src/trigger.c \
        src/soft-trigger.c \
@@ -168,6 +167,10 @@ libsigrok_la_SOURCES += \
        src/scale/kern.c
 
 # Hardware drivers
+
+# This entry must be placed before all drivers
+libsigrok_la_SOURCES += src/hardware/driver_list_start.c
+
 if HW_AGILENT_DMM
 libsigrok_la_SOURCES += \
        src/hardware/agilent-dmm/api.c \
@@ -404,6 +407,12 @@ libsigrok_la_SOURCES += \
        src/hardware/openbench-logic-sniffer/protocol.c \
        src/hardware/openbench-logic-sniffer/api.c
 endif
+if HW_PCE_322A
+libsigrok_la_SOURCES += \
+       src/hardware/pce-322a/protocol.h \
+       src/hardware/pce-322a/protocol.c \
+       src/hardware/pce-322a/api.c
+endif
 if HW_PIPISTRELLO_OLS
 libsigrok_la_SOURCES += \
        src/hardware/pipistrello-ols/protocol.h \
@@ -500,6 +509,9 @@ libsigrok_la_SOURCES += \
        src/hardware/zeroplus-logic-cube/api.c
 endif
 
+# This entry must be placed after all drivers
+libsigrok_la_SOURCES += src/hardware/driver_list_end.c
+
 libsigrok_la_LIBADD = $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
 libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
 
@@ -530,6 +542,7 @@ EXTRA_DIST = \
        bindings/python/sigrok/__init__.py \
        bindings/python/sigrok/core/__init__.py \
        bindings/python/sigrok/core/classes.i \
+       bindings/ruby/classes.i \
        bindings/java/Doxyfile \
        bindings/java/org/sigrok/core/classes/classes.i \
        bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java \
@@ -691,36 +704,40 @@ $(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
        $(AM_V_at)test -d $(RDIR) || $(MKDIR_P) $(RDIR)
        $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) > $@
 
-$(RWRAP): $(RDIR)/classes.i $(RDOC) \
+$(RWRAP): $(srcdir)/$(RDIR)/classes.i $(RDOC) \
                bindings/swig/classes.i bindings/swig/templates.i \
                bindings/swig/enums.i
-       $(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include -I$(RDIR) $(local_includes) $(swig_defs) -o $@ $<
+       $(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include -I$(RDIR) $(local_includes) $(swig_defs) -o $@ $(srcdir)/$(RDIR)/classes.i
 
 $(ROBJ): $(RWRAP) \
                $(library_include_HEADERS) \
                $(nodist_library_include_HEADERS) \
                $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
                $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
-       $(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include $(local_includes) -fPIC -o $@ -c $<
+       $(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include $(local_includes) -fPIC -o $@ -c $(RWRAP)
 
 $(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la
-       $(AM_V_CXXLD)$(CXX) -shared -std=c++11 -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
+       $(AM_V_CXXLD)$(CXX) -shared -o $@ $(ROBJ) -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
 
 ruby-build: $(REXT)
 
 ruby-install: $(REXT)
        $(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
-       $(INSTALL) $< $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
+       $(INSTALL) $(REXT) $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
+
+ruby-uninstall:
+       rm -f $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)/sigrok.$(RUBY_DLEXT)
 
 ruby-clean:
        -$(AM_V_at)rm -fr $(RDIR)/doc
        -$(AM_V_at)rm -f $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
 
 ruby-doc: $(RWRAP)
-       $(AM_V_at)yard doc -o $(RDIR)/doc $<
+       $(AM_V_at)yard doc -o $(RDIR)/doc $(RWRAP)
 
 BUILD_EXTRA += ruby-build
 INSTALL_EXTRA += ruby-install
+UNINSTALL_EXTRA += ruby-uninstall
 CLEAN_EXTRA += ruby-clean
 
 endif