X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=c9b899387684711add4e9cc92ec1b4224d0510f5;hb=44b46d703612aa7dfc406043cf1b82bdae19179b;hp=cd8a49d3a810f60d910a96ad8e257a7ad2e0d5b0;hpb=d5794ad63ac0bc6f090b799b12d310c30860217b;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index cd8a49d3..c9b89938 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,6 +148,7 @@ libsigrok_la_SOURCES += \ src/dmm/fs9922.c \ src/dmm/m2110.c \ src/dmm/metex14.c \ + src/dmm/asycii.c \ src/dmm/rs9lcd.c \ src/dmm/bm25x.c \ src/dmm/ut71x.c \ @@ -179,9 +180,9 @@ src_libdrivers_la_SOURCES = src/drivers.c if HW_AGILENT_DMM src_libdrivers_la_SOURCES += \ - src/hardware/agilent-dmm/api.c \ - src/hardware/agilent-dmm/agilent-dmm.h \ - src/hardware/agilent-dmm/sched.c + src/hardware/agilent-dmm/protocol.h \ + src/hardware/agilent-dmm/protocol.c \ + src/hardware/agilent-dmm/api.c endif if HW_APPA_55II src_libdrivers_la_SOURCES += \ @@ -267,16 +268,20 @@ src_libdrivers_la_SOURCES += \ endif if HW_DEMO src_libdrivers_la_SOURCES += \ - src/hardware/demo/demo.c + src/hardware/demo/protocol.h \ + src/hardware/demo/protocol.c \ + src/hardware/demo/api.c endif -if HW_DEREE_DE5000 +if HW_DREAMSOURCELAB_DSLOGIC src_libdrivers_la_SOURCES += \ - src/hardware/deree-de5000/api.c + src/hardware/dreamsourcelab-dslogic/protocol.h \ + src/hardware/dreamsourcelab-dslogic/protocol.c \ + src/hardware/dreamsourcelab-dslogic/api.c endif if HW_FLUKE_DMM src_libdrivers_la_SOURCES += \ - src/hardware/fluke-dmm/fluke-dmm.h \ - src/hardware/fluke-dmm/fluke.c \ + src/hardware/fluke-dmm/protocol.h \ + src/hardware/fluke-dmm/protocol.c \ src/hardware/fluke-dmm/api.c endif if HW_FTDI_LA @@ -289,9 +294,7 @@ if HW_FX2LAFW src_libdrivers_la_SOURCES += \ src/hardware/fx2lafw/protocol.h \ src/hardware/fx2lafw/protocol.c \ - src/hardware/fx2lafw/api.c \ - src/hardware/fx2lafw/dslogic.c \ - src/hardware/fx2lafw/dslogic.h + src/hardware/fx2lafw/api.c endif if HW_GMC_MH_1X_2X src_libdrivers_la_SOURCES += \ @@ -319,8 +322,8 @@ src_libdrivers_la_SOURCES += \ endif if HW_HANTEK_DSO src_libdrivers_la_SOURCES += \ - src/hardware/hantek-dso/dso.h \ - src/hardware/hantek-dso/dso.c \ + src/hardware/hantek-dso/protocol.h \ + src/hardware/hantek-dso/protocol.c \ src/hardware/hantek-dso/api.c endif if HW_HP_3457A @@ -377,6 +380,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/lecroy-logicstudio/protocol.c \ src/hardware/lecroy-logicstudio/api.c endif +if HW_LECROY_XSTREAM +src_libdrivers_la_SOURCES += \ + src/hardware/lecroy-xstream/protocol.h \ + src/hardware/lecroy-xstream/protocol.c \ + src/hardware/lecroy-xstream/api.c +endif if HW_MANSON_HCS_3XXX src_libdrivers_la_SOURCES += \ src/hardware/manson-hcs-3xxx/protocol.h \ @@ -431,6 +440,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/rigol-ds/protocol.c \ src/hardware/rigol-ds/api.c endif +if HW_ROHDE_SCHWARZ_SME_0X +src_libdrivers_la_SOURCES += \ + src/hardware/rohde-schwarz-sme-0x/protocol.h \ + src/hardware/rohde-schwarz-sme-0x/protocol.c \ + src/hardware/rohde-schwarz-sme-0x/api.c +endif if HW_SALEAE_LOGIC16 src_libdrivers_la_SOURCES += \ src/hardware/saleae-logic16/protocol.h \ @@ -450,6 +465,10 @@ src_libdrivers_la_SOURCES += \ src/hardware/serial-dmm/protocol.c \ src/hardware/serial-dmm/api.c endif +if HW_SERIAL_LCR +src_libdrivers_la_SOURCES += \ + src/hardware/serial-lcr/api.c +endif if HW_SYSCLK_LWLA src_libdrivers_la_SOURCES += \ src/hardware/sysclk-lwla/lwla.h \ @@ -529,6 +548,15 @@ noinst_HEADERS = src/libsigrok-internal.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsigrok.pc +mimeappdir = $(datadir)/mime/packages +mimeapp_DATA = contrib/vnd.sigrok.session.xml + +mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes +mimeicon_DATA = contrib/libsigrok.png + +mimeiconscalabledir = $(datadir)/icons/hicolor/scalable/mimetypes +mimeiconscalable_DATA = contrib/libsigrok.svg + EXTRA_DIST = \ Doxyfile \ HACKING \ @@ -553,7 +581,10 @@ EXTRA_DIST = \ bindings/swig/classes.i \ bindings/swig/doc.py \ bindings/swig/templates.i \ - contrib/sigrok-logo-notext.png \ + contrib/libsigrok_112x112.png \ + contrib/libsigrok.png \ + contrib/libsigrok.svg \ + contrib/vnd.sigrok.session.xml \ contrib/z60_libsigrok.rules if HAVE_CHECK @@ -586,13 +617,18 @@ INSTALL_EXTRA = UNINSTALL_EXTRA = CLEAN_EXTRA = +libsigrok-uninstall: + -rmdir $(DESTDIR)$(includedir)/libsigrok + +UNINSTALL_EXTRA += libsigrok-uninstall + if BINDINGS_CXX lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp -bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS) +bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS) $(SR_EXTRA_CXX_LIBS) bindings_cxx_libsigrokcxx_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx @@ -628,6 +664,11 @@ cxx-clean: CLEAN_EXTRA += cxx-clean +cxx-uninstall: + -rmdir $(DESTDIR)$(includedir)/libsigrokcxx + +UNINSTALL_EXTRA += cxx-uninstall + endif CPPXMLDOC = bindings/cxx/doxy/xml/index.xml @@ -645,7 +686,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='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)' +setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CXX='$(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) @@ -780,9 +821,9 @@ $(JLIB): $(JCXX) \ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \ $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \ @ORDER@ bindings/cxx/libsigrokcxx.la - $(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \ + $(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) $(LDFLAGS) -L.libs -Lbindings/cxx/.libs \ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \ - -lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB) + -lsigrokcxx $(LIBSIGROKCXX_LIBS) $(SR_EXTRA_CXX_LIBS) -o $(JLIB) java-install: $(INSTALL) -d $(DESTDIR)$(libdir)/jni @@ -810,7 +851,7 @@ endif all-local: $(BUILD_EXTRA) install-exec-local: $(INSTALL_EXTRA) -uninstall-local: $(UNINSTALL_EXTRA) +uninstall-hook: $(UNINSTALL_EXTRA) clean-local: $(CLEAN_EXTRA) .PHONY: dist-changelog