X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=46b319d91fc32f74cd9c13fbc9e7bcf3eff6f7c5;hb=97fbf6704e5876f3cfbc519f05acaa2af65a6ff0;hp=8095ff2cd4d6352a9b3b6c76a34f21f4e398ffad;hpb=8a7b47cdfae4a4a95e92958beab41a4985e8f8e3;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 8095ff2c..46b319d9 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,9 +17,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 firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -30,9 +32,10 @@ libsigrok_la_SOURCES = \
 	session.c \
 	session_file.c \
 	session_driver.c \
-	hwplugin.c \
+	hwdriver.c \
 	filter.c \
-	strutil.c
+	strutil.c \
+	log.c
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -40,7 +43,7 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
-libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
+libsigrok_la_LDFLAGS = $(LIBSIGROK_LT_LDFLAGS)
 
 include_HEADERS = sigrok.h sigrok-proto.h
 noinst_HEADERS = sigrok-internal.h
@@ -48,3 +51,5 @@ noinst_HEADERS = sigrok-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
+EXTRA_DIST = Doxyfile
+