From 63d0fb752830fa8ea225ed9a9776e44a0ba66928 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Sat, 26 Apr 2014 03:03:11 +0100 Subject: [PATCH] Move public headers into include/libsigrok. This is needed so that the C++ bindings, the header for which references "libsigrok/libsigrok.h", can have a valid include directory passed to build them before the headers are installed. --- Makefile.am | 5 ++++- configure.ac | 4 ++-- libsigrok.h => include/libsigrok/libsigrok.h | 0 proto.h => include/libsigrok/proto.h | 0 version.h.in => include/libsigrok/version.h.in | 0 5 files changed, 6 insertions(+), 3 deletions(-) rename libsigrok.h => include/libsigrok/libsigrok.h (100%) rename proto.h => include/libsigrok/proto.h (100%) rename version.h.in => include/libsigrok/version.h.in (100%) diff --git a/Makefile.am b/Makefile.am index 8a8a2e1e..322be597 100644 --- a/Makefile.am +++ b/Makefile.am @@ -333,7 +333,10 @@ libsigrok_la_LIBADD = $(LIBOBJS) libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS) library_includedir = $(includedir)/libsigrok -library_include_HEADERS = libsigrok.h proto.h version.h +library_include_HEADERS = \ + include/libsigrok/libsigrok.h \ + include/libsigrok/proto.h \ + include/libsigrok/version.h noinst_HEADERS = libsigrok-internal.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index c8992ba1..cd9fc124 100644 --- a/configure.ac +++ b/configure.ac @@ -316,7 +316,7 @@ esac AC_SUBST(SR_PKGLIBS) -CFLAGS="$CFLAGS $LIB_CFLAGS" +CFLAGS="$CFLAGS -I./include/libsigrok $LIB_CFLAGS" # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers. @@ -525,7 +525,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR) AC_SUBST(SR_PACKAGE_VERSION_MICRO) AC_SUBST(SR_PACKAGE_VERSION) -AC_CONFIG_FILES([Makefile version.h libsigrok.pc]) +AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc]) AC_OUTPUT diff --git a/libsigrok.h b/include/libsigrok/libsigrok.h similarity index 100% rename from libsigrok.h rename to include/libsigrok/libsigrok.h diff --git a/proto.h b/include/libsigrok/proto.h similarity index 100% rename from proto.h rename to include/libsigrok/proto.h diff --git a/version.h.in b/include/libsigrok/version.h.in similarity index 100% rename from version.h.in rename to include/libsigrok/version.h.in