diff options
| author | Peng Wu <alexepico@gmail.com> | 2013-02-17 17:28:43 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2013-02-17 17:31:26 +0800 |
| commit | a8421c0fb6a25e4af628d43841cbb8b7cca81997 (patch) | |
| tree | d9e86d4c93d7236cd0c4650b57271d822c503798 /src | |
| parent | 8c8eabf8451c91635edf4cf48b20bc59210037ef (diff) | |
| download | libpinyin-a8421c0fb6a25e4af628d43841cbb8b7cca81997.tar.gz libpinyin-a8421c0fb6a25e4af628d43841cbb8b7cca81997.tar.xz libpinyin-a8421c0fb6a25e4af628d43841cbb8b7cca81997.zip | |
Fixes issue reported by fundawang:
https://github.com/libpinyin/libpinyin/issues/33
merge libpinyin-0.8.0-link.patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lookup/Makefile.am | 2 | ||||
| -rw-r--r-- | src/storage/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5ac2c6f..5600c86 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,7 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ @@ -44,7 +44,7 @@ noinst_LTLIBRARIES = libpinyin_internal.la libpinyin_la_SOURCES = pinyin.cpp -libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la +libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ -version-info @LT_VERSION_INFO@ diff --git a/src/lookup/Makefile.am b/src/lookup/Makefile.am index 3f15a99..00d7df4 100644 --- a/src/lookup/Makefile.am +++ b/src/lookup/Makefile.am @@ -19,7 +19,7 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ noinst_HEADERS = lookup.h \ pinyin_lookup2.h \ diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 322a9b5..4a2f1f8 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ |