X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=63b7cacd82d6e8fe14b9770f3dc751d7a60b2067;hb=ff7f7f730557fdea2bf381d61c41f8d9862475e9;hp=63b26d6fc96c3503afd3aa29a4a4a786c87c5328;hpb=dfa92ad4118c63a703e5433a89b26fb8c3b69c40;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 63b26d6f..63b7cacd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,8 @@ GNUMAKEFLAGS = --no-print-directory
 # distutils/setuptools cause trouble on distcheck. Disable for now.
 DISTCHECK_CONFIGURE_FLAGS = --disable-python
 
+CLEAN_EXTRA =
+
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
 local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. @RPC_CFLAGS@
@@ -73,7 +75,10 @@ libsigrok_la_SOURCES = \
 
 # Support code, shared among input and driver modules
 libsigrok_la_SOURCES += \
-	src/minilzo/minilzo.c
+	src/minilzo/minilzo.c \
+	src/minilzo/minilzo.h \
+	src/minilzo/lzoconf.h \
+	src/minilzo/lzodefs.h
 
 # Input modules
 libsigrok_la_SOURCES += \
@@ -83,6 +88,7 @@ libsigrok_la_SOURCES += \
 	src/input/chronovu_la8.c \
 	src/input/csv.c \
 	src/input/logicport.c \
+	src/input/protocoldata.c \
 	src/input/raw_analog.c \
 	src/input/saleae.c \
 	src/input/trace32_ad.c \
@@ -256,6 +262,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/asix-sigma/protocol.c \
 	src/hardware/asix-sigma/api.c
 endif
+if HW_ATORCH
+src_libdrivers_la_SOURCES += \
+	src/hardware/atorch/protocol.h \
+	src/hardware/atorch/protocol.c \
+	src/hardware/atorch/api.c
+endif
 if HW_ATTEN_PPS3XXX
 src_libdrivers_la_SOURCES += \
 	src/hardware/atten-pps3xxx/protocol.h \
@@ -722,6 +734,35 @@ nodist_library_include_HEADERS = \
 	include/libsigrok/version.h
 noinst_HEADERS = src/libsigrok-internal.h
 
+$(builddir)/src/version.lo: $(builddir)/include/libsigrok/git-version.h
+
+# Create the git-version.h file even for non-versioned source trees,
+# to reduce complexity in the library code. Re-create the header file
+# when branches change, when revisions change, or upon re-configuration.
+# Use the verbatim tagged version number when applicable, or append the
+# "-git-<hash>[-dirty]" suffix for non-tagged source trees.
+if VCS_IS_GIT
+
+$(builddir)/include/libsigrok/git-version.h: Makefile $(VERSION_GITVERSION_DEPS)
+	$(AM_V_GEN) \
+		HASH=`git -C "$(srcdir)" describe --match "@VERSION_TAG_MATCH@" --always --dirty` && \
+		HASH=`echo "$${HASH}" | sed 's/@VERSION_TAG_MATCH@-//'` && \
+		SUFFIX=`git -C "$(srcdir)" describe --match "@VERSION_TAG_MATCH@" --exact-match > /dev/null 2> /dev/null || echo "-$${HASH}"` && \
+		echo "#undef SR_PACKAGE_VERSION_STRING_SUFFIX" > $@ && \
+		echo "#define SR_PACKAGE_VERSION_STRING_SUFFIX \"$${SUFFIX}\"" >> $@
+
+else
+
+$(builddir)/include/libsigrok/git-version.h:
+	$(AM_V_GEN)echo '#define SR_PACKAGE_VERSION_STRING_SUFFIX ""' > $@
+
+endif
+
+version-clean:
+	rm -f $(builddir)/include/libsigrok/git-version.h
+
+CLEAN_EXTRA += version-clean
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
@@ -764,7 +805,11 @@ EXTRA_DIST = \
 	contrib/vnd.sigrok.session.xml \
 	contrib/60-libsigrok.rules \
 	contrib/61-libsigrok-plugdev.rules \
-	contrib/61-libsigrok-uaccess.rules
+	contrib/61-libsigrok-uaccess.rules \
+	src/minilzo/COPYING \
+	src/minilzo/Makefile \
+	src/minilzo/README.LZO \
+	src/minilzo/testmini.c
 
 if HAVE_CHECK
 TESTS = tests/main
@@ -795,7 +840,6 @@ tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 BUILD_EXTRA =
 INSTALL_EXTRA =
 UNINSTALL_EXTRA =
-CLEAN_EXTRA =
 
 libsigrok-uninstall:
 	-rmdir $(DESTDIR)$(includedir)/libsigrok