X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;h=9ce6760ae2821aa472292873a4cea0aa2eca16c1;hp=ef408422551783b77db9431b629bde299071521d;hb=b18b8a92028475ca3d9ab33c06248d37075837be;hpb=e1ccfb191062d13b98bb7536d162a044e0758678 diff --git a/Makefile.am b/Makefile.am index ef408422..9ce6760a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,32 @@ ## along with this program. If not, see . ## -ACLOCAL_AMFLAGS = -I autostuff +ACLOCAL_AMFLAGS = -I m4 +AM_LIBTOOLFLAGS = --silent +GNUMAKEFLAGS = --no-print-directory -AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +# distutils/setuptools cause trouble on distcheck. Disable for now. +DISTCHECK_CONFIGURE_FLAGS = --disable-python + +FIRMWARE_DIR = $(datadir)/sigrok-firmware + +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) $(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) $(LIBSIGROKCXX_CFLAGS) lib_LTLIBRARIES = libsigrok.la @@ -37,6 +60,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 \ @@ -49,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 @@ -77,7 +103,9 @@ libsigrok_la_SOURCES += \ # SCPI support libsigrok_la_SOURCES += \ + src/scpi.h \ src/scpi/scpi.c \ + src/scpi/helpers.c \ src/scpi/scpi_tcp.c if NEED_RPC libsigrok_la_SOURCES += \ @@ -106,7 +134,7 @@ libsigrok_la_SOURCES += \ src/scpi/scpi_libgpib.c endif -# modbus support +# Modbus support libsigrok_la_SOURCES += \ src/modbus/modbus.c if NEED_SERIAL @@ -125,7 +153,8 @@ libsigrok_la_SOURCES += \ src/dmm/bm25x.c \ src/dmm/ut71x.c \ src/dmm/ut372.c \ - src/dmm/vc870.c + src/dmm/vc870.c \ + src/dmm/dtm0660.c # Hardware (LCR chip parsers) if NEED_SERIAL @@ -133,6 +162,10 @@ libsigrok_la_SOURCES += \ src/lcr/es51919.c endif +# Hardware (Scale protocol parsers) +libsigrok_la_SOURCES += \ + src/scale/kern.c + # Hardware drivers if HW_AGILENT_DMM libsigrok_la_SOURCES += \ @@ -148,8 +181,9 @@ libsigrok_la_SOURCES += \ endif if HW_ASIX_SIGMA libsigrok_la_SOURCES += \ - src/hardware/asix-sigma/asix-sigma.h \ - src/hardware/asix-sigma/asix-sigma.c + src/hardware/asix-sigma/protocol.h \ + src/hardware/asix-sigma/protocol.c \ + src/hardware/asix-sigma/api.c endif if HW_ATTEN_PPS3XXX libsigrok_la_SOURCES += \ @@ -243,6 +277,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 \ @@ -255,6 +295,12 @@ libsigrok_la_SOURCES += \ src/hardware/hantek-dso/dso.c \ src/hardware/hantek-dso/api.c endif +if HW_HUNG_CHANG_DSO_2100 +libsigrok_la_SOURCES += \ + src/hardware/hung-chang-dso-2100/protocol.h \ + src/hardware/hung-chang-dso-2100/protocol.c \ + src/hardware/hung-chang-dso-2100/api.c +endif if HW_IKALOGIC_SCANALOGIC2 libsigrok_la_SOURCES += \ src/hardware/ikalogic-scanalogic2/protocol.h \ @@ -273,12 +319,30 @@ libsigrok_la_SOURCES += \ src/hardware/kecheng-kc-330b/protocol.c \ src/hardware/kecheng-kc-330b/api.c endif +if HW_KERN_SCALE +libsigrok_la_SOURCES += \ + src/hardware/kern-scale/protocol.h \ + src/hardware/kern-scale/protocol.c \ + src/hardware/kern-scale/api.c +endif +if HW_KORAD_KAXXXXP +libsigrok_la_SOURCES += \ + src/hardware/korad-kaxxxxp/protocol.h \ + src/hardware/korad-kaxxxxp/protocol.c \ + src/hardware/korad-kaxxxxp/api.c +endif if HW_LASCAR_EL_USB libsigrok_la_SOURCES += \ src/hardware/lascar-el-usb/protocol.h \ 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 \ @@ -350,6 +414,8 @@ if HW_SYSCLK_LWLA libsigrok_la_SOURCES += \ src/hardware/sysclk-lwla/lwla.h \ src/hardware/sysclk-lwla/lwla.c \ + src/hardware/sysclk-lwla/lwla1016.c \ + src/hardware/sysclk-lwla/lwla1034.c \ src/hardware/sysclk-lwla/protocol.h \ src/hardware/sysclk-lwla/protocol.c \ src/hardware/sysclk-lwla/api.c @@ -409,16 +475,14 @@ libsigrok_la_SOURCES += \ src/hardware/zeroplus-logic-cube/api.c endif -libsigrok_la_LIBADD = $(LIBOBJS) - -libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS) - -libsigrok_la_LDFLAGS += -no-undefined +libsigrok_la_LIBADD = $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS) +libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined library_includedir = $(includedir)/libsigrok library_include_HEADERS = \ include/libsigrok/libsigrok.h \ - include/libsigrok/proto.h \ + include/libsigrok/proto.h +nodist_library_include_HEADERS = \ include/libsigrok/version.h noinst_HEADERS = src/libsigrok-internal.h @@ -429,6 +493,25 @@ EXTRA_DIST = \ Doxyfile \ HACKING \ README.devices \ + bindings/cxx/ConfigKey_methods.cpp \ + bindings/cxx/ConfigKey_methods.hpp \ + bindings/cxx/ConfigKey_methods.i \ + bindings/cxx/Doxyfile \ + bindings/cxx/QuantityFlag_methods.cpp \ + bindings/cxx/QuantityFlag_methods.hpp \ + bindings/cxx/enums.py \ + bindings/python/Doxyfile \ + bindings/python/setup.py \ + bindings/python/sigrok/__init__.py \ + bindings/python/sigrok/core/__init__.py \ + bindings/python/sigrok/core/classes.i \ + bindings/java/Doxyfile \ + 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/swig/classes.i \ + bindings/swig/doc.py \ + bindings/swig/templates.i \ contrib/gnuplot_chronovu_la8.gpi \ contrib/gnuplot_rigol_ds1xx2.gpi \ contrib/gnuplot_usbeesx.gpi \ @@ -438,10 +521,9 @@ EXTRA_DIST = \ contrib/z60_libsigrok.rules if HAVE_CHECK - TESTS = tests/main - check_PROGRAMS = ${TESTS} +endif tests_main_SOURCES = \ include/libsigrok/libsigrok.h \ @@ -458,16 +540,14 @@ tests_main_SOURCES = \ tests/version.c \ tests/driver_all.c \ tests/device.c \ - tests/trigger.c + tests/trigger.c \ + tests/analog.c -tests_main_CFLAGS = @check_CFLAGS@ - -tests_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@ - -endif +tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS) BUILD_EXTRA = INSTALL_EXTRA = +UNINSTALL_EXTRA = CLEAN_EXTRA = if BINDINGS_CXX @@ -476,15 +556,13 @@ lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp -bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS) - -bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS) - -bindings_cxx_libsigrokcxx_la_LDFLAGS += -no-undefined +bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS) +bindings_cxx_libsigrokcxx_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx bindings_cxx_libsigrokcxx_la_include_HEADERS = \ - bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \ + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \ bindings/cxx/include/libsigrokcxx/enums.hpp pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc @@ -492,8 +570,8 @@ pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc doxy/xml/index.xml: include/libsigrok/libsigrok.h $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null +bindings/swig/enums.i: bindings/cxx/enums.timestamp bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp - bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml \ @@ -502,11 +580,12 @@ bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml $(AM_V_at)touch $@ bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \ - $(library_include_HEADERS) + $(library_include_HEADERS) $(nodist_library_include_HEADERS) cxx-clean: rm -rf doxy/ rm -rf bindings/cxx/doxy/ + rm -f bindings/swig/enums.i rm -f bindings/cxx/enums.cpp rm -f bindings/cxx/include/libsigrokcxx/enums.hpp rm -f bindings/cxx/enums.timestamp @@ -521,41 +600,53 @@ $(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 -$(PDOC): bindings/swig/doc.py $(CPPXMLDOC) - $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core - $(AM_V_GEN)$(PYTHON) $< python $(CPPXMLDOC) > $@ - -python-build: $(PDIR)/timestamp +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) -python-quietclean: - $(AM_V_at)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \ - | grep -v "can.t clean it"; true +$(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 > $@ -$(PDIR)/timestamp: bindings/cxx/libsigrokcxx.la $(PDIR)/sigrok/core/classes.i \ - bindings/swig/classes.i $(PDOC) $(library_include_HEADERS) - $(AM_V_at)$(MAKE) python-quietclean - $(AM_V_GEN)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \ - | grep -v "command line option.*Wstrict-prototypes"; true - $(AM_V_at)touch $(PDIR)/timestamp +$(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) end > $@ -$(DESTDIR)$(prefix): - $(MKDIR_P) $@ +python-build: $(PDIR)/timestamp -python-install: $(DESTDIR)$(prefix) - cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) `test "$(DESTDIR)" && echo --root=$(DESTDIR)` +$(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \ + 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)" --swig-opts '$(swig_defs)' build_py + $(AM_V_at): >$@ + +python-install: + $(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)" + destdir='$(DESTDIR)'; $(setup_py) install $${destdir:+"--root=$$destdir"} \ + --prefix "$(prefix)" --exec-prefix "$(exec_prefix)" python-clean: - $(AM_V_at)$(MAKE) python-quietclean - $(AM_V_at)rm -f $(PDIR)/timestamp - $(AM_V_at)rm -rf $(PDIR)/doxy/ + -$(AM_V_at)rm -f $(PDIR)/timestamp + -$(AM_V_at)rm -fr $(PDIR)/doxy + -$(AM_V_at)$(setup_py) clean --all 2>/dev/null python-doc: - $(AM_V_at)cd $(srcdir)/$(PDIR) && BUILDDIR=$(abs_builddir)/$(PDIR)/ doxygen Doxyfile 2>/dev/null + $(AM_V_at)cd $(srcdir)/$(PDIR) && BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null BUILD_EXTRA += python-build INSTALL_EXTRA += python-install @@ -563,6 +654,51 @@ 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_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 $(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 -fPIC -o $@ -c $< + +$(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la + $(AM_V_CXXLD)$(CXX) -shared -std=c++11 -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-clean: + -$(AM_V_at)rm -fr $(RDIR)/doc + -$(AM_V_at)rm $(REXT) $(ROBJ) $(RWRAP) $(RDOC) + +ruby-doc: $(RWRAP) + $(AM_V_at)yard doc -o $(RDIR)/doc $< + +BUILD_EXTRA += ruby-build +INSTALL_EXTRA += ruby-install +CLEAN_EXTRA += ruby-clean + +endif + if BINDINGS_JAVA JDIR = bindings/java @@ -576,59 +712,76 @@ JCXX = $(JCLS)/classes_wrap.cxx JLIB = $(JDIR)/libsigrok_java_core_classes.so JJAR = $(JDIR)/sigrok-core.jar +java_cleanfiles = $(JCXX) $(JCLS)/*.java $(JCLS)/*.class $(JINT)/*.class $(JJAR) $(JLIB) + java-build: $(JJAR) $(JLIB) -$(JDOC): bindings/swig/doc.py $(CPPXMLDOC) +$(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS) - $(AM_V_GEN)python $< java $(CPPXMLDOC) > $@ - -$(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS) - $(AM_V_at)make java-clean - $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \ - -I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $< + $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) > $@ + +$(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++ $(swig_defs) \ + -java -package org.sigrok.core.classes \ + -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \ + -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG) $(JJAR): $(JCXX) - $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC) + $(AM_V_GEN)$(JAVAC) -d $(JDIR) $(JSRC) $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG) -$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) - $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \ +$(JLIB): $(JCXX) \ + $(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_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \ - -lsigrokcxx -o $(JLIB) + -lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB) java-install: - $(INSTALL) -d $(libdir)/jni - $(INSTALL) $(JLIB) -t $(libdir)/jni - $(INSTALL) -d $(datadir)/java - $(INSTALL) $(JJAR) -t $(datadir)/java + $(INSTALL) -d $(DESTDIR)$(libdir)/jni + $(INSTALL) $(JLIB) $(DESTDIR)$(libdir)/jni + $(INSTALL) -d $(DESTDIR)$(datadir)/java + $(INSTALL) $(JJAR) $(DESTDIR)$(datadir)/java + +java-uninstall: + -rm -f $(DESTDIR)$(datadir)/java/sigrok-core.jar + -rm -f $(DESTDIR)$(libdir)/jni/libsigrok_java_core_classes.so java-clean: - $(AM_V_at)rm -f $(JCXX) - $(AM_V_at)rm -f $(JCLS)/*.java - $(AM_V_at)rm -f $(JCLS)/*.class - $(AM_V_at)rm -f $(JINT)/*.class - $(AM_V_at)rm -f $(JJAR) - $(AM_V_at)rm -f $(JLIB) - $(AM_V_at)rm -rf $(JDIR)/doxy/ + -$(AM_V_at)rm -f $(java_cleanfiles) $(JDOC) + -$(AM_V_at)rm -fr $(JDIR)/doxy java-doc: - $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR=$(abs_builddir)/$(JDIR)/ doxygen Doxyfile 2>/dev/null + $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile BUILD_EXTRA += java-build INSTALL_EXTRA += java-install +UNINSTALL_EXTRA += java-uninstall CLEAN_EXTRA += java-clean endif all-local: $(BUILD_EXTRA) install-exec-local: $(INSTALL_EXTRA) +uninstall-local: $(UNINSTALL_EXTRA) clean-local: $(CLEAN_EXTRA) -MAINTAINERCLEANFILES = ChangeLog +.PHONY: dist-changelog -.PHONY: ChangeLog -ChangeLog: - git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog +dist-hook: dist-changelog -dist-hook: ChangeLog +dist-changelog: + $(AM_V_at)if test ! -d '$(top_srcdir)/.git'; then \ + cp -f '$(top_srcdir)/ChangeLog' "$(top_distdir)/ChangeLog"; \ + elif git -C '$(top_srcdir)' log >.ChangeLog.tmp; then \ + mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \ + else \ + rm -f .ChangeLog.tmp; exit 1; \ + fi