Makefile.am: Add NEED_SERIAL condition.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a7cb82440cabef6d048a7a628b8756546fd42be9..319f932910460ab61010368a5dcd6e5caf8f432e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,7 @@ libsigrok_la_SOURCES += \
        src/dmm/ut71x.c
 
 # Hardware (LCR chip parsers)
-if HW_DEREE_DE5000
+if NEED_SERIAL
 libsigrok_la_SOURCES += \
        src/lcr/es51919.c
 endif
@@ -444,7 +444,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
 bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
-library_include_HEADERS += \
+bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
+bindings_cxx_libsigrokcxx_la_include_HEADERS = \
        bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
        bindings/cxx/include/libsigrokcxx/enums.hpp