From c1f86f02a149f46609273e1bd5b42696d544727a Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 3 May 2013 14:49:21 +0200 Subject: [PATCH] Main header is now. This matches the convention used in libsigrok. Potential other headers might end up in libsigrokdecode/, but only libsigrokdecode.h is meant to be #included by frontends directly. --- .gitignore | 2 +- Makefile.am | 5 +++-- configure.ac | 2 +- controller.c | 4 ++-- decoder.c | 4 ++-- exception.c | 4 ++-- sigrokdecode-internal.h => libsigrokdecode-internal.h | 6 +++--- sigrokdecode.h.in => libsigrokdecode.h.in | 2 +- log.c | 4 ++-- module_sigrokdecode.c | 4 ++-- type_decoder.c | 4 ++-- type_logic.c | 2 +- util.c | 4 ++-- version.c | 2 +- 14 files changed, 25 insertions(+), 24 deletions(-) rename sigrokdecode-internal.h => libsigrokdecode-internal.h (95%) rename sigrokdecode.h.in => libsigrokdecode.h.in (99%) diff --git a/.gitignore b/.gitignore index da30138..b812ba6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ map missing stamp-h1 autostuff/ -sigrokdecode.h +libsigrokdecode.h ChangeLog INSTALL diff --git a/Makefile.am b/Makefile.am index e6f2ced..d3f91b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,8 +31,9 @@ libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \ -DDECODERS_DIR='"$(DECODERS_DIR)"' libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON) -include_HEADERS = sigrokdecode.h -noinst_HEADERS = sigrokdecode-internal.h +library_includedir = $(includedir)/libsigrokdecode +library_include_HEADERS = libsigrokdecode.h +noinst_HEADERS = libsigrokdecode-internal.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsigrokdecode.pc diff --git a/configure.ac b/configure.ac index 5431835..3ed527f 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,7 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO) AC_SUBST(SRD_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile - sigrokdecode.h + libsigrokdecode.h libsigrokdecode.pc contrib/Makefile decoders/Makefile diff --git a/controller.c b/controller.c index e023b71..c9825b9 100644 --- a/controller.c +++ b/controller.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include #include diff --git a/decoder.c b/decoder.c index c8eb98f..21e24c4 100644 --- a/decoder.c +++ b/decoder.c @@ -19,8 +19,8 @@ */ #include "config.h" -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include /** diff --git a/exception.c b/exception.c index cd9d2b2..1ce66a8 100644 --- a/exception.c +++ b/exception.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include #include diff --git a/sigrokdecode-internal.h b/libsigrokdecode-internal.h similarity index 95% rename from sigrokdecode-internal.h rename to libsigrokdecode-internal.h index b969356..718f11e 100644 --- a/sigrokdecode-internal.h +++ b/libsigrokdecode-internal.h @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H -#define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H +#ifndef LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H +#define LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H -#include "sigrokdecode.h" +#include "libsigrokdecode.h" /*--- controller.c ----------------------------------------------------------*/ diff --git a/sigrokdecode.h.in b/libsigrokdecode.h.in similarity index 99% rename from sigrokdecode.h.in rename to libsigrokdecode.h.in index 7aac0ba..877aeb1 100644 --- a/sigrokdecode.h.in +++ b/libsigrokdecode.h.in @@ -42,7 +42,7 @@ extern "C" { * The correct way to get/use the libsigrokdecode API functions is: * * @code{.c} - * #include + * #include * @endcode */ diff --git a/log.c b/log.c index 49a18eb..36dcd95 100644 --- a/log.c +++ b/log.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include #include diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c index 557ad1a..f88a6e9 100644 --- a/module_sigrokdecode.c +++ b/module_sigrokdecode.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" /** @cond PRIVATE */ diff --git a/type_decoder.c b/type_decoder.c index 1de3b0e..16675bc 100644 --- a/type_decoder.c +++ b/type_decoder.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include diff --git a/type_logic.c b/type_logic.c index 6f266aa..9f2b392 100644 --- a/type_logic.c +++ b/type_logic.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include "config.h" #include #include diff --git a/util.c b/util.c index aec73fa..74d56c3 100644 --- a/util.c +++ b/util.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" /** diff --git a/version.c b/version.c index 9449c2d..8fbbafa 100644 --- a/version.c +++ b/version.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "sigrokdecode.h" +#include "libsigrokdecode.h" /** * @file -- 2.30.2