Move most contrib/ stuff to libsigrok.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8095ff2cd4d6352a9b3b6c76a34f21f4e398ffad..77c804e461849bffaabc2720c969bb5a047b6608 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
+AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
 
-SUBDIRS = hardware input output firmware
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -32,7 +32,8 @@ libsigrok_la_SOURCES = \
        session_driver.c \
        hwplugin.c \
        filter.c \
-       strutil.c
+       strutil.c \
+       log.c
 
 libsigrok_la_LIBADD = \
        $(LIBOBJS) \