diff options
| author | Peter Stuge <peter@stuge.se> | 2010-04-18 23:24:36 +0100 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2010-04-18 23:24:36 +0100 |
| commit | 243760885eb5c410ca79d4f954052b3c94cca342 (patch) | |
| tree | 15587cb1fafc4a3f4f1de2c40a4b52677bb30037 | |
| parent | 307c5490de47a9fa5b556f98b402a323e19286e6 (diff) | |
| download | libusb-243760885eb5c410ca79d4f954052b3c94cca342.tar.gz | |
configure creates libusb-1.0.rc to not duplicate the version number
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | libusb/libusb-1.0.rc.in (renamed from libusb/libusb-1.0.rc) | 19 |
3 files changed, 15 insertions, 21 deletions
@@ -1,10 +1,6 @@ This file lists notable changes in each release. For the full history of all changes, see ChangeLog. -2010-04-XX: v1.0.7 -* Bug fixes -* Windows backend - 2009-11-22: v1.0.6 * Bug fixes * Increase libusb_handle_events() timeout to 60s for powersaving diff --git a/configure.ac b/configure.ac index 98eb6c4..6feff5d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,13 @@ -AC_INIT([libusb], [1.0.7], [libusb-devel@lists.sourceforge.net], [libusb], [http://www.libusb.org]) +m4_define(LIBUSB_MAJOR, [1]) +m4_define(LIBUSB_MINOR, [0]) +m4_define(LIBUSB_MICRO, [6]) + +AC_INIT([libusb], LIBUSB_MAJOR.LIBUSB_MINOR.LIBUSB_MICRO, [libusb-devel@lists.sourceforge.net], [libusb], [http://www.libusb.org/]) + +AC_SUBST([LIBUSB_VERSION_MAJOR], [LIBUSB_MAJOR]) +AC_SUBST([LIBUSB_VERSION_MINOR], [LIBUSB_MINOR]) +AC_SUBST([LIBUSB_VERSION_MICRO], [LIBUSB_MICRO]) + AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([libusb/core.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -160,6 +169,6 @@ AC_SUBST(VISIBILITY_CFLAGS) AC_SUBST(AM_CFLAGS) AC_SUBST(AM_LDFLAGS) -AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile] [doc/doxygen.cfg]) +AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [libusb/libusb-1.0.rc] [examples/Makefile] [doc/Makefile] [doc/doxygen.cfg]) AC_OUTPUT diff --git a/libusb/libusb-1.0.rc b/libusb/libusb-1.0.rc.in index b010135..306eaec 100644 --- a/libusb/libusb-1.0.rc +++ b/libusb/libusb-1.0.rc.in @@ -26,17 +26,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #define VER_ORIGINALFILENAME_STR "libusb-1.0.dll\0" #endif -#define VER_MAJOR 1 -#define VER_MAJOR_STR "1" -#define VER_MINOR 0 -#define VER_MINOR_STR "0" -#define VER_MICRO 7 -#define VER_MICRO_STR "7" -#define VER_NANO 0 -#define VER_NANO_STR "0" -#define VER_VERSION_STR VER_MAJOR_STR ", " VER_MINOR_STR ", " VER_MICRO_STR ", " VER_NANO_STR "\0" - - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -65,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION VER_MAJOR,VER_MINOR,VER_MICRO,VER_NANO - PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_MICRO,VER_NANO + FILEVERSION @LIBUSB_VERSION_MAJOR@,@LIBUSB_VERSION_MINOR@,@LIBUSB_VERSION_MICRO@,0 + PRODUCTVERSION @LIBUSB_VERSION_MAJOR@,@LIBUSB_VERSION_MINOR@,@LIBUSB_VERSION_MICRO@,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -84,14 +73,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "libusb.org\0" VALUE "FileDescription", "libusb-1\0" - VALUE "FileVersion", VER_VERSION_STR + VALUE "FileVersion", "@PACKAGE_VERSION@" VALUE "InternalName", "libusb\0" VALUE "LegalCopyright", "See individual source files, GNU LGPL v2.1 or later.\0" VALUE "LegalTrademarks", "http://www.gnu.org/licenses/lgpl-2.1.html\0" VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR VALUE "PrivateBuild", "\0" VALUE "ProductName", "libusb-1\0" - VALUE "ProductVersion", VER_VERSION_STR + VALUE "ProductVersion", "@PACKAGE_VERSION@" VALUE "SpecialBuild", "\0" END END |