X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=1544a017c092aa1079de94186bb5d43f56de628c;hb=dc7125bb7cfe34f63695ea928dda17594dfac3d2;hp=aff066919abae93299b98cd80529cfd9bc4b61c2;hpb=52ff4f6a04cbdb966ee538bd447ae206215b528a;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index aff06691..1544a017 100644 --- a/Makefile.am +++ b/Makefile.am @@ -444,9 +444,10 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS) bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS) -library_include_HEADERS += \ - bindings/cxx/include/libsigrok/libsigrok.hpp \ - bindings/cxx/include/libsigrok/enums.hpp +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 pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc @@ -455,7 +456,7 @@ doxy/xml/index.xml: include/libsigrok/libsigrok.h bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp -bindings/cxx/include/libsigrok/enums.hpp: 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/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp @@ -469,7 +470,7 @@ cxx-clean: rm -rf doxy/ rm -rf bindings/cxx/doxy/ rm -f bindings/cxx/enums.cpp - rm -f bindings/cxx/include/libsigrok/enums.hpp + rm -f bindings/cxx/include/libsigrokcxx/enums.hpp rm -f bindings/cxx/enums.timestamp CLEAN_EXTRA += cxx-clean @@ -478,7 +479,7 @@ endif CPPXMLDOC = bindings/cxx/doxy/xml/index.xml -$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrok.hpp \ +$(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \ bindings/cxx/enums.timestamp $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null