From b988c0639be9b5b184aa2fed5fd69338abe748f5 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 30 Aug 2011 15:00:37 +0800 Subject: install public headers only --- src/Makefile.am | 16 ++++++++++------ src/include/Makefile.am | 5 +++-- src/lookup/Makefile.am | 8 ++++---- src/storage/Makefile.am | 7 +++++-- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2ada1da..44188a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,6 +18,8 @@ AUTOMAKE_OPTIONS = gnu SUBDIRS = include storage lookup +EXTRA_DIST = libpinyin.ver + MAINTAINERCLEANFILES = Makefile.in CLEANFILES = *.bak @@ -32,18 +34,20 @@ INCLUDES = -I$(top_srcdir)/src \ libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ -libpinyininclude_HEADERS= pinyin.h \ - pinyin_internal.h +libpinyininclude_HEADERS= pinyin.h + +noinst_HEADERS = pinyin_internal.h + +lib_LTLIBRARIES = libpinyin.la -lib_LTLIBRARIES = libpinyin.la \ - libpinyin_internal.la +noinst_LTLIBRARIES = libpinyin_internal.la libpinyin_la_SOURCES = pinyin.cpp libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la -libpinyin_la_LDFLAGS = -Wl,--version-script=libpinyin.ver \ - -version-info "0:3:0" +libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ + -version-info "0:3:0" libpinyin_internal_la_SOURCES = pinyin_internal.cpp diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 3aaa60d..1b29002 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -19,6 +19,7 @@ MAINTAINERCLEANFILES = Makefile.in libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ -libpinyininclude_HEADERS= memory_chunk.h \ - novel_types.h \ +libpinyininclude_HEADERS= novel_types.h + +noinst_HEADERS = memory_chunk.h \ stl_lite.h diff --git a/src/lookup/Makefile.am b/src/lookup/Makefile.am index 9efb92e..fdbe709 100644 --- a/src/lookup/Makefile.am +++ b/src/lookup/Makefile.am @@ -21,10 +21,10 @@ INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CPPFLAGS@ -libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ - -libpinyininclude_HEADERS= lookup.h pinyin_lookup.h \ - phrase_lookup.h winner_tree.h +noinst_HEADERS = lookup.h \ + pinyin_lookup.h \ + phrase_lookup.h \ + winner_tree.h noinst_LTLIBRARIES = liblookup.la diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 64c1008..60bc4a0 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -21,8 +21,10 @@ INCLUDES = -I$(top_srcdir)/src/include \ libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ -libpinyininclude_HEADERS= pinyin_large_table.h \ - pinyin_base.h \ +libpinyininclude_HEADERS= pinyin_custom.h \ + pinyin_base.h + +noinst_HEADERS = pinyin_large_table.h \ pinyin_phrase.h \ phrase_index.h \ phrase_index_logger.h \ @@ -32,6 +34,7 @@ libpinyininclude_HEADERS= pinyin_large_table.h \ flexible_ngram.h \ tag_utility.h + noinst_LTLIBRARIES = libstorage.la libstorage_la_CXXFLAGS = "-fPIC" -- cgit