X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=660b0fc95e250de0bf050e6f5ba47ef96c263835;hb=ae2cdde4d20e600480ae2cb86b7488fa13400812;hp=d94019ce9055dd11ad2e8e47526c632b08210771;hpb=56c8705e37314dafe35b680d2254b6f844e0ecc2;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index d94019ce..660b0fc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,14 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. if BINDINGS_CXX local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx endif +# Do not hard-code the firmware location on Windows. +if WIN32 +global_defs = +else +global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +endif # Ensure that local include directories are always searched first. -AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +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. @@ -51,6 +57,7 @@ libsigrok_la_SOURCES = \ src/soft-trigger.c \ src/analog.c \ src/fallback.c \ + src/resource.c \ src/strutil.c \ src/log.c \ src/version.c \ @@ -262,6 +269,12 @@ libsigrok_la_SOURCES += \ src/hardware/gmc-mh-1x-2x/protocol.c \ src/hardware/gmc-mh-1x-2x/api.c endif +if HW_GWINSTEK_GDS_800 +libsigrok_la_SOURCES += \ + src/hardware/gwinstek-gds-800/protocol.h \ + src/hardware/gwinstek-gds-800/protocol.c \ + src/hardware/gwinstek-gds-800/api.c +endif if HW_HAMEG_HMO libsigrok_la_SOURCES += \ src/hardware/hameg-hmo/protocol.h \ @@ -304,6 +317,12 @@ libsigrok_la_SOURCES += \ src/hardware/kern-scale/protocol.c \ src/hardware/kern-scale/api.c endif +if HW_KORAD_KDXXXXP +libsigrok_la_SOURCES += \ + src/hardware/korad-kdxxxxp/protocol.h \ + src/hardware/korad-kdxxxxp/protocol.c \ + src/hardware/korad-kdxxxxp/api.c +endif if HW_LASCAR_EL_USB libsigrok_la_SOURCES += \ src/hardware/lascar-el-usb/protocol.h \ @@ -474,7 +493,6 @@ EXTRA_DIST = \ bindings/java/org/sigrok/core/classes/classes.i \ bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java \ bindings/java/org/sigrok/core/interfaces/LogCallback.java \ - bindings/java/org/sigrok/core/interfaces/SourceCallback.java \ bindings/swig/classes.i \ bindings/swig/doc.py \ contrib/gnuplot_chronovu_la8.gpi \ @@ -505,7 +523,8 @@ tests_main_SOURCES = \ tests/version.c \ tests/driver_all.c \ tests/device.c \ - tests/trigger.c + tests/trigger.c \ + tests/analog.c tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS) @@ -562,29 +581,39 @@ $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \ bindings/cxx/enums.timestamp $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null +# Macro definitions to be used by the SWIG parser. +swig_defs = -Dnoexcept= -Dprivate=protected -DG_GNUC_BEGIN_IGNORE_DEPRECATIONS= -DG_GNUC_END_IGNORE_DEPRECATIONS= + if BINDINGS_PYTHON PDIR = bindings/python -PDOC = bindings/python/sigrok/core/doc.i +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)' LDADD='$(PYSIGROK_LIBS)' +setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)' setup_quiet = --quiet setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet) -$(PDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) +$(PDOC_START): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) + $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core + $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) start > $@ + +$(PDOC_END): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core - $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) > $@ + $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) end > $@ python-build: $(PDIR)/timestamp $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \ - bindings/swig/classes.i bindings/swig/enums.i $(PDOC) \ - $(library_include_HEADERS) $(nodist_library_include_HEADERS) \ + bindings/swig/classes.i bindings/swig/templates.i \ + bindings/swig/enums.i $(PDOC_START) $(PDOC_END) \ + $(library_include_HEADERS) \ + $(nodist_library_include_HEADERS) \ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \ $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \ @ORDER@ bindings/cxx/libsigrokcxx.la $(AM_V_at)$(setup_py) clean --all 2>/dev/null - $(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" build_py + $(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" --swig-opts '$(swig_defs)' build_py $(AM_V_at): >$@ python-install: @@ -627,11 +656,13 @@ $(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS) $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) > $@ -$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \ +$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i \ + bindings/swig/templates.i bindings/swig/enums.i \ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \ $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) -$(AM_V_at)rm -f $(java_cleanfiles) - $(AM_V_GEN)$(SWIG) -c++ -java -package org.sigrok.core.classes \ + $(AM_V_GEN)$(SWIG) -c++ $(swig_defs) \ + -java -package org.sigrok.core.classes \ -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \ -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG) @@ -650,9 +681,9 @@ $(JLIB): $(JCXX) \ java-install: $(INSTALL) -d $(DESTDIR)$(libdir)/jni - $(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni + $(INSTALL) $(JLIB) $(DESTDIR)$(libdir)/jni $(INSTALL) -d $(DESTDIR)$(datadir)/java - $(INSTALL) $(JJAR) -t $(DESTDIR)$(datadir)/java + $(INSTALL) $(JJAR) $(DESTDIR)$(datadir)/java java-clean: -$(AM_V_at)rm -f $(java_cleanfiles) @@ -675,7 +706,7 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog + git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@ dist-hook: ChangeLog