X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=c87321aebdd74200e0fca5304d4161e7098c2994;hb=786934010365a0b33aa8a32a7dc62a2975dba4c7;hp=a7de7a65d5a1230153e2cc18675c8e4d43691b71;hpb=40f5ddac0125b1a7c9b2625dda631f3c0ba24a4b;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index a7de7a65..c87321ae 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
@@ -17,9 +18,11 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
+ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = hardware input output firmware
+AM_CPPFLAGS = -I$(top_srcdir)
+
+SUBDIRS = contrib hardware input output
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -28,9 +31,14 @@ libsigrok_la_SOURCES = \
 	datastore.c \
 	device.c \
 	session.c \
-	hwplugin.c \
+	session_file.c \
+	session_driver.c \
+	hwdriver.c \
 	filter.c \
-	strutil.c
+	strutil.c \
+	log.c \
+	version.c \
+	error.c
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -38,11 +46,22 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
-libsigrok_la_LDFLAGS = $(SIGROK_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
+