X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=e2ccabb6cbc27150a7b4316f63c6e18eb410414d;hb=edb000eb2f78aff4ea805ffc25a07792bedcea90;hp=3b0ed715c861e4e384b4968c57e2f6238f741cce;hpb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 3b0ed715..e2ccabb6 100644
--- 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
 
@@ -32,10 +32,12 @@ libsigrok_la_SOURCES = \
 	session.c \
 	session_file.c \
 	session_driver.c \
-	hwplugin.c \
+	hwdriver.c \
 	filter.c \
 	strutil.c \
-	log.c
+	log.c \
+	version.c
+	error.c
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -43,13 +45,22 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
-libsigrok_la_LDFLAGS = $(LIBSIGROK_LT_LDFLAGS)
+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
 
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+ChangeLog:
+	git --git-dir $(top_srcdir)/../.git log > ChangeLog || touch ChangeLog
+
+dist-hook: ChangeLog
+