X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=7f61c19b2b17e126e0e2b4ccdfa4e7a88d1b597c;hb=5a2c71ccd7c46b18583dd068a8508e9d93ed9190;hp=4ed41bf7b63e500de698162f0d4d0cd78c2a9172;hpb=16fc7ee29ffa196d29a20fddd81234792f88b12c;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index 4ed41bf7..7f61c19b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ AM_CPPFLAGS = $(local_includes) $(global_defs) # The tests CFLAGS are a superset of the libsigrok CFLAGS, and the # python bindings CFLAGS are a superset of the C++ bindings CFLAGS. AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(TESTS_CFLAGS) -AM_CXXFLAGS = $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS) +AM_CXXFLAGS = $(SR_WXXFLAGS) $(LIBSIGROKCXX_CFLAGS) lib_LTLIBRARIES = libsigrok.la @@ -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 \ @@ -65,7 +64,8 @@ libsigrok_la_SOURCES = \ src/log.c \ src/version.c \ src/error.c \ - src/std.c + src/std.c \ + src/sw_limits.c # Input modules libsigrok_la_SOURCES += \ @@ -73,6 +73,8 @@ libsigrok_la_SOURCES += \ src/input/binary.c \ src/input/chronovu_la8.c \ src/input/csv.c \ + src/input/raw_analog.c \ + src/input/trace32_ad.c \ src/input/vcd.c \ src/input/wav.c @@ -165,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 \ @@ -177,6 +183,12 @@ libsigrok_la_SOURCES += \ src/hardware/appa-55ii/protocol.c \ src/hardware/appa-55ii/api.c endif +if HW_ARACHNID_LABS_RE_LOAD_PRO +libsigrok_la_SOURCES += \ + src/hardware/arachnid-labs-re-load-pro/protocol.h \ + src/hardware/arachnid-labs-re-load-pro/protocol.c \ + src/hardware/arachnid-labs-re-load-pro/api.c +endif if HW_ASIX_SIGMA libsigrok_la_SOURCES += \ src/hardware/asix-sigma/protocol.h \ @@ -261,6 +273,12 @@ libsigrok_la_SOURCES += \ src/hardware/fluke-dmm/fluke.c \ src/hardware/fluke-dmm/api.c endif +if HW_FTDI_LA +libsigrok_la_SOURCES += \ + src/hardware/ftdi-la/protocol.h \ + src/hardware/ftdi-la/protocol.c \ + src/hardware/ftdi-la/api.c +endif if HW_FX2LAFW libsigrok_la_SOURCES += \ src/hardware/fx2lafw/protocol.h \ @@ -287,12 +305,24 @@ libsigrok_la_SOURCES += \ src/hardware/hameg-hmo/protocol.c \ src/hardware/hameg-hmo/api.c endif +if HW_HANTEK_6XXX +libsigrok_la_SOURCES += \ + src/hardware/hantek-6xxx/protocol.h \ + src/hardware/hantek-6xxx/protocol.c \ + src/hardware/hantek-6xxx/api.c +endif if HW_HANTEK_DSO libsigrok_la_SOURCES += \ src/hardware/hantek-dso/dso.h \ src/hardware/hantek-dso/dso.c \ src/hardware/hantek-dso/api.c endif +if HW_HP_3457A +libsigrok_la_SOURCES += \ + src/hardware/hp-3457a/protocol.h \ + src/hardware/hp-3457a/protocol.c \ + src/hardware/hp-3457a/api.c +endif if HW_HUNG_CHANG_DSO_2100 libsigrok_la_SOURCES += \ src/hardware/hung-chang-dso-2100/protocol.h \ @@ -335,6 +365,12 @@ libsigrok_la_SOURCES += \ src/hardware/lascar-el-usb/protocol.c \ src/hardware/lascar-el-usb/api.c endif +if HW_LECROY_LOGICSTUDIO +libsigrok_la_SOURCES += \ + src/hardware/lecroy-logicstudio/protocol.h \ + src/hardware/lecroy-logicstudio/protocol.c \ + src/hardware/lecroy-logicstudio/api.c +endif if HW_MANSON_HCS_3XXX libsigrok_la_SOURCES += \ src/hardware/manson-hcs-3xxx/protocol.h \ @@ -371,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 \ @@ -467,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 @@ -497,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 \ @@ -601,7 +647,7 @@ PDIR = bindings/python PDOC_START = bindings/python/sigrok/core/doc_start.i PDOC_END = bindings/python/sigrok/core/doc_end.i -setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)' +setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)' setup_quiet = --quiet setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet) @@ -646,6 +692,56 @@ CLEAN_EXTRA += python-clean endif +if BINDINGS_RUBY + +RDIR = bindings/ruby +RDOC = $(RDIR)/doc.i +RWRAP = $(RDIR)/classes_wrap.cpp +ROBJ = $(RWRAP:.cpp=.o) +REXT = $(RDIR)/sigrok.$(RUBY_DLEXT) + +$(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) \ + 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 $@ $< + +$(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 $< + +$(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la + $(AM_V_CXXLD)$(CXX) -shared -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS) + +ruby-build: $(REXT) + +ruby-install: $(REXT) + $(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR) + $(INSTALL) $< $(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 $< + +BUILD_EXTRA += ruby-build +INSTALL_EXTRA += ruby-install +UNINSTALL_EXTRA += ruby-uninstall +CLEAN_EXTRA += ruby-clean + +endif + if BINDINGS_JAVA JDIR = bindings/java