agilent-dmm: make parser deal with input better

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 885878e356146a105febdfcbf9a4f2184396989e..e2ccabb6cbc27150a7b4316f63c6e18eb410414d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I autostuff
 
 AM_CPPFLAGS = -I$(top_srcdir)
 
-SUBDIRS = contrib hardware input output firmware
+SUBDIRS = contrib hardware input output
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -35,7 +35,9 @@ libsigrok_la_SOURCES = \
        hwdriver.c \
        filter.c \
        strutil.c \
-       log.c
+       log.c \
+       version.c
+       error.c
 
 libsigrok_la_LIBADD = \
        $(LIBOBJS) \
@@ -45,15 +47,16 @@ libsigrok_la_LIBADD = \
 
 libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
-include_HEADERS = sigrok.h sigrok-proto.h
-noinst_HEADERS = sigrok-internal.h
+library_includedir = $(includedir)/libsigrok
+library_include_HEADERS = libsigrok.h proto.h version.h
+noinst_HEADERS = libsigrok-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
 EXTRA_DIST = Doxyfile
 
-DISTCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 ChangeLog: