log messages: Use device name, not vendor name.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index df0e9de48c570ff49bd829381ba3e53e623c4148..c01801e40fd72ee906162a09ac3122629b749d9e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
 
 SUBDIRS = hardware input output firmware
 
-# lib_LTLIBRARIES = libsigrok.la
-noinst_LTLIBRARIES = libsigrok.la
+lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
        backend.c \
@@ -33,7 +32,8 @@ libsigrok_la_SOURCES = \
        session_driver.c \
        hwplugin.c \
        filter.c \
-       strutil.c
+       strutil.c \
+       log.c
 
 libsigrok_la_LIBADD = \
        $(LIBOBJS) \
@@ -43,10 +43,9 @@ libsigrok_la_LIBADD = \
 
 libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
 
-# include_HEADERS = sigrok.h sigrok-proto.h
-# noinst_HEADERS = sigrok-internal.h
-noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libsigrok.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc