diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-08-05 14:49:25 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-08-05 14:50:12 -0400 |
| commit | c96b2a6a3b2b2bb106163254b034a8fdcc3081e5 (patch) | |
| tree | b24a018f975ea35418c40dd445d071a8a0312f36 | |
| parent | 413af41134a5a1686191fdfe30dab2179f8c042d (diff) | |
| download | pango-c96b2a6a3b2b2bb106163254b034a8fdcc3081e5.tar.gz | |
[HB] Fix build of main.cc
| -rw-r--r-- | pango/Makefile.am | 4 | ||||
| -rw-r--r-- | pango/opentype/Makefile.am | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 5ac73717..316f7218 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -262,14 +262,14 @@ pangoft2_public_sources = \ libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) libpangoft2_1_0_la_LIBADD = \ - opentype/libharfbuzz-1.la \ + opentype/libharfbuzz.la \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_FC_MODULES) \ $(GLIB_LIBS) \ $(FREETYPE_LIBS) \ $(libm) libpangoft2_1_0_la_DEPENDENCIES = \ - opentype/libharfbuzz-1.la \ + opentype/libharfbuzz.la \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_FC_MODULES) libpangoft2_1_0_la_SOURCES = \ diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index bfb91df5..68b40669 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -4,7 +4,7 @@ NULL = CXX = $(CC) -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align -noinst_LTLIBRARIES = libharfbuzz-1.la +noinst_LTLIBRARIES = libharfbuzz.la HBSOURCES = \ hb-blob.c \ @@ -35,14 +35,14 @@ HBHEADERS = \ hb-ot-layout.h \ $(NULL) -libharfbuzz_1_la_SOURCES = $(HBSOURCES) $(HBHEADERS) -libharfbuzz_1_la_LIBADD = +libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) +libharfbuzz_la_LIBADD = noinst_PROGRAMS = main main_SOURCES = main.cc main_CXXFLAGS = $(GLIB_CFLAGS) -main_LDADD = $(GLIB_LIBS) +main_LDADD = libharfbuzz.la $(GLIB_LIBS) EXTRA_DIST = README COPYING |