]> sigrok.org Git - libsigrok.git/commitdiff
Build: Do not distribute generated headers
authorDaniel Elstner <redacted>
Sat, 15 Aug 2015 16:33:05 +0000 (18:33 +0200)
committerDaniel Elstner <redacted>
Sun, 16 Aug 2015 16:28:13 +0000 (18:28 +0200)
version.h and enums.hpp are generated at build time and should
not be included in the distribution tarball.  This seems to have
triggered a weird error when doing a VPATH build of the dist
tarball.

Makefile.am

index a020af4ed074f9df00472e018385c672bc863d2d..4bba0c7243ca5d68e9c9fac6b89e4632b3e3ac96 100644 (file)
@@ -421,7 +421,8 @@ libsigrok_la_LDFLAGS += -no-undefined
 library_includedir = $(includedir)/libsigrok
 library_include_HEADERS = \
        include/libsigrok/libsigrok.h \
 library_includedir = $(includedir)/libsigrok
 library_include_HEADERS = \
        include/libsigrok/libsigrok.h \
-       include/libsigrok/proto.h \
+       include/libsigrok/proto.h
+nodist_library_include_HEADERS = \
        include/libsigrok/version.h
 noinst_HEADERS = src/libsigrok-internal.h
 
        include/libsigrok/version.h
 noinst_HEADERS = src/libsigrok-internal.h
 
@@ -506,7 +507,8 @@ bindings_cxx_libsigrokcxx_la_LDFLAGS += -no-undefined
 
 bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
 bindings_cxx_libsigrokcxx_la_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/libsigrokcxx.hpp
+nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \
        bindings/cxx/include/libsigrokcxx/enums.hpp
 
 pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
        bindings/cxx/include/libsigrokcxx/enums.hpp
 
 pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc