X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=101a9a583185d07c35088a111836059f1bc92f04;hb=6dddd902244f314eba721a0d8804731ea9c9912d;hp=4d532e0c6ab5ea72c4f5bd8b696165ee7406f49d;hpb=2566bd4884bf33518488504575ba62e99ef43a7b;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 4d532e0c..101a9a58 100644
--- 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
@@ -17,10 +17,11 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \
-	      -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = hardware input output
+AM_CPPFLAGS = -I$(top_srcdir)
+
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -29,8 +30,12 @@ libsigrok_la_SOURCES = \
 	datastore.c \
 	device.c \
 	session.c \
-	hwplugin.c \
-	filter.c
+	session_file.c \
+	session_driver.c \
+	hwdriver.c \
+	filter.c \
+	strutil.c \
+	log.c
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -38,8 +43,21 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
+libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
+
 include_HEADERS = sigrok.h sigrok-proto.h
+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
+