X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d220857f2ac5ea99f2f327475ef8497ebffdd760;hb=79bb0e97d53526ef6deb491ea9c7698ed6e90631;hp=e0bf75f9ac05c10318058a3d11173298a20dafdf;hpb=dd8b5f565f60d536104b30bee8aadf4ea333aa7c;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index e0bf75f9..d220857f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 ##
 ## 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>
+## 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,21 +22,23 @@ ACLOCAL_AMFLAGS = -I autostuff
 
 AM_CPPFLAGS = -I$(top_srcdir)
 
-SUBDIRS = contrib hardware input output firmware
+SUBDIRS = contrib hardware input output tests
 
 lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
 	backend.c \
-	datastore.c \
 	device.c \
 	session.c \
 	session_file.c \
 	session_driver.c \
-	hwplugin.c \
+	hwdriver.c \
 	filter.c \
 	strutil.c \
-	log.c
+	log.c \
+	version.c \
+	error.c \
+	std.c
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -43,13 +46,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
+