hantek-dso: proper protocol implementation of trigger/samplerate setting

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae85f48c207ee4da2aa221ec8dbf5956c4bf83f9..3bd9f8944bb729c5110b5e5dddeb5a5f179f4457 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -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,11 @@ 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
 
 libsigrok_la_LIBADD = \
        $(LIBOBJS) \
@@ -43,7 +44,7 @@ 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
@@ -51,3 +52,13 @@ noinst_HEADERS = sigrok-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
+