diff options
author | behdad <behdad> | 2002-08-10 04:17:50 +0000 |
---|---|---|
committer | behdad <behdad> | 2002-08-10 04:17:50 +0000 |
commit | d36f39eb576785c468e878e7be816b4f1a7eff39 (patch) | |
tree | 42ead87fd16991ae07bc3e4b1acc933ec70d0418 | |
parent | 1dba8060c6abba62f8a25834b6e0e547c1ba5f3b (diff) |
Small fixes.
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | fribidi_config.h | 3 | ||||
-rw-r--r-- | fribidi_config.h.in | 1 | ||||
-rw-r--r-- | win/fribidi.dsp | 2 | ||||
-rw-r--r-- | win/version.rc | 4 |
6 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 9686f3a..5a8b638 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ libfribidi_charsets_extra = \ libfribidi_charsets_h = \ fribidi_char_sets.h \ fribidi_char_sets_utf8.h + libfribidi_charsets_extra_h = \ fribidi_char_sets_cap_rtl.h \ fribidi_char_sets_cp1255.h \ @@ -28,6 +29,9 @@ libfribidi_charsets_extra_h = \ fribidi_char_sets_iso8859_6.h \ fribidi_char_sets_iso8859_8.h +libfribidi_extra_h = \ + fribidi_mem.h + lib_LTLIBRARIES = libfribidi.la libfribidi_la_SOURCES = \ @@ -48,7 +52,6 @@ libfribidiincdir = $(includedir)/fribidi libfribidiinc_HEADERS = \ fribidi.h \ fribidi_types.h \ - fribidi_mem.h \ fribidi_unicode.h \ $(libfribidi_charsets_h) \ $(libfribidi_charsets_extra_h) \ @@ -88,6 +91,7 @@ OTHER_FILES = \ EXTRA_HEADERS = \ packtab.h \ + $(libfribidi_extra_h) \ $(GETOPT_HDR) EXTRA_DIST = \ diff --git a/configure.in b/configure.in index d7810d4..7573060 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ AC_INIT(fribidi.c) # FRIBIDI_MAJOR_VERSION=0 FRIBIDI_MINOR_VERSION=10 -FRIBIDI_MICRO_VERSION=5pre +FRIBIDI_MICRO_VERSION=-5 FRIBIDI_INTERFACE_VERSION=2 FRIBIDI_INTERFACE_AGE=5 FRIBIDI_BINARY_AGE=5 diff --git a/fribidi_config.h b/fribidi_config.h index fc3d19b..e34a789 100644 --- a/fribidi_config.h +++ b/fribidi_config.h @@ -1,9 +1,10 @@ #define FRIBIDI_PACKAGE "fribidi" -#define FRIBIDI_VERSION "0.10.5pre" +#define FRIBIDI_VERSION "0.10.-5" #define FRIBIDI_MAJOR_VERSION 0 #define FRIBIDI_MINOR_VERSION 10 +#define FRIBIDI_MICRO_VERSION -5 #define FRIBIDI_INTERFACE_VERSION 2 #if 0 /* FRIBIDI_NO_CHARSETS */ diff --git a/fribidi_config.h.in b/fribidi_config.h.in index aa204e3..79aceb1 100644 --- a/fribidi_config.h.in +++ b/fribidi_config.h.in @@ -4,6 +4,7 @@ #define FRIBIDI_VERSION "@FRIBIDI_VERSION@" #define FRIBIDI_MAJOR_VERSION @FRIBIDI_MAJOR_VERSION@ #define FRIBIDI_MINOR_VERSION @FRIBIDI_MINOR_VERSION@ +#define FRIBIDI_MICRO_VERSION @FRIBIDI_MICRO_VERSION@ #define FRIBIDI_INTERFACE_VERSION @FRIBIDI_INTERFACE_VERSION@ #if @FRIBIDI_NO_CHARSETS@ /* FRIBIDI_NO_CHARSETS */ diff --git a/win/fribidi.dsp b/win/fribidi.dsp index d651493..0e421a3 100644 --- a/win/fribidi.dsp +++ b/win/fribidi.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=fribidi - Win32 Debug Speed Optimized +CFG=fribidi - Win32 Release Memory Optimized !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE diff --git a/win/version.rc b/win/version.rc index c0a934c..1c5b968 100644 --- a/win/version.rc +++ b/win/version.rc @@ -30,8 +30,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // VS_VERSION_INFO VERSIONINFO - FILEVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,0 - PRODUCTVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,0 + FILEVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,FRIBIDI_INTERFACE_VERSION + PRODUCTVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,FRIBIDI_INTERFACE_VERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L |