From f6e32b2dfa322aa4bd4a279a46d588e0e73ea238 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Mon, 20 Jan 2020 04:51:52 +0000 Subject: [PATCH] Use a static header file, not dependent on autoconf. --- .gitignore | 1 - configure.ac | 2 +- libserialport.h.in => libserialport.h | 16 ++++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) rename libserialport.h.in => libserialport.h (99%) diff --git a/.gitignore b/.gitignore index 07fa721..f65a44b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ /configure /configure.lineno /libserialport-*.tar.* -/libserialport.h /libserialport.pc /libtool stamp-h? diff --git a/configure.ac b/configure.ac index 3baeaab..fa40460 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ m4_define([sp_package_version], [sp_package_version_major.sp_package_version_min AC_INIT([libserialport], [sp_package_version], [martin-libserialport@earth.li], [libserialport], [http://sigrok.org/wiki/Libserialport]) -AC_CONFIG_HEADERS([config.h libserialport.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) diff --git a/libserialport.h.in b/libserialport.h similarity index 99% rename from libserialport.h.in rename to libserialport.h index 67df3d7..235263f 100644 --- a/libserialport.h.in +++ b/libserialport.h @@ -1622,32 +1622,32 @@ void sp_default_debug_handler(const char *format, ...); */ /** The libserialport package 'major' version number. */ -#undef SP_PACKAGE_VERSION_MAJOR +#define SP_PACKAGE_VERSION_MAJOR 0 /** The libserialport package 'minor' version number. */ -#undef SP_PACKAGE_VERSION_MINOR +#define SP_PACKAGE_VERSION_MINOR 1 /** The libserialport package 'micro' version number. */ -#undef SP_PACKAGE_VERSION_MICRO +#define SP_PACKAGE_VERSION_MICRO 1 /** The libserialport package version ("major.minor.micro") as string. */ -#undef SP_PACKAGE_VERSION_STRING +#define SP_PACKAGE_VERSION_STRING "0.1.1" /* * Library/libtool version macros (can be used for conditional compilation). */ /** The libserialport libtool 'current' version number. */ -#undef SP_LIB_VERSION_CURRENT +#define SP_LIB_VERSION_CURRENT 1 /** The libserialport libtool 'revision' version number. */ -#undef SP_LIB_VERSION_REVISION +#define SP_LIB_VERSION_REVISION 0 /** The libserialport libtool 'age' version number. */ -#undef SP_LIB_VERSION_AGE +#define SP_LIB_VERSION_AGE 1 /** The libserialport libtool version ("current:revision:age") as string. */ -#undef SP_LIB_VERSION_STRING +#define SP_LIB_VERSION_STRING "1:0:1" /** * Get the major libserialport package version number.