[pango/harfbuzz-ng] [HB] Fix build of main.cc

[Behdad Esfahbod <behdad src gnome org>]

commit c96b2a6a3b2b2bb106163254b034a8fdcc3081e5
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed Aug 5 14:49:25 2009 -0400

    [HB] Fix build of main.cc

 pango/Makefile.am          |    4 ++--
 pango/opentype/Makefile.am |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 5ac7371..316f721 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 bfb91df..68b4066 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