VCD data parsing

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8dc0eed4199560ab316c77bf810073f3f1af7604..c87321aebdd74200e0fca5304d4161e7098c2994 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@
 ## This file is part of the sigrok project.
 ##
 ## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.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 +22,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
 
@@ -36,7 +37,8 @@ libsigrok_la_SOURCES = \
        filter.c \
        strutil.c \
        log.c \
-       version.c
+       version.c \
+       error.c
 
 libsigrok_la_LIBADD = \
        $(LIBOBJS) \
@@ -46,15 +48,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: