Fix problem building with BSD make

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a7cb82440cabef6d048a7a628b8756546fd42be9..65212ce674f8e721f2d71469562bf353928f8e85 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
 
@@ -457,9 +458,9 @@ bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
 bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp
 
-bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \
+bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml \
                bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
-       $(AM_V_GEN)$(PYTHON) $< doxy/xml/index.xml
+       $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml
        $(AM_V_at)touch $@
 
 bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \