From 1f0ceeb8cf2fad0a0dfd338ce1472470a81789d4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 2 Nov 2009 16:28:39 -0500 Subject: [PATCH] Install library --- autogen.sh | 2 +- src/Makefile.am | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index c7abf74fe..ad7104dfd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -135,7 +135,7 @@ version_check autoconf AUTOCONF $AUTOCONF $autoconf_min_vers \ # # Hunt for an appropriate version of automake and aclocal; we can't # assume that 'automake' is necessarily the most recent installed version -# +# # We check automake first to allow it to be a newer version than we know about. # version_check automake AUTOMAKE "$AUTOMAKE automake automake-1.10 automake-1.9 automake-1.8 automake-1.7" $automake_min_vers \ diff --git a/src/Makefile.am b/src/Makefile.am index d8b84e6dc..707dd4ca5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ NULL = # The following warning options are useful for debugging: -Wpadded -Wcast-align #AM_CXXFLAGS = -noinst_LTLIBRARIES = libharfbuzz.la +lib_LTLIBRARIES = libharfbuzz.la HBSOURCES = \ hb-blob.c \ @@ -46,6 +46,7 @@ HBHEADERS = \ libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) libharfbuzz_la_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS) libharfbuzz_la_LIBADD = $(GLIB_LIBS) +pkginclude_HEADERS = $(HBHEADERS) noinst_PROGRAMS = main @@ -53,6 +54,4 @@ main_SOURCES = main.cc main_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS) main_LDADD = libharfbuzz.la $(GLIB_LIBS) -EXTRA_DIST = README COPYING - -include $(top_srcdir)/git.mk