Bug 591413 – needs to link with libstdc++

[framework/uifw/harfbuzz.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 68b4066..ee9bd14 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
 
 NULL =
 
-CXX = $(CC) -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align
+# The following warning options are useful for debugging: -Wpadded -Wcast-align
+#AM_CXXFLAGS =
 
 noinst_LTLIBRARIES = libharfbuzz.la
 
@@ -12,7 +13,12 @@ HBSOURCES =  \
        hb-buffer-private.h \
        hb-font.cc \
        hb-font-private.h \
+       hb-glib.h \
+       hb-glib.c \
        hb-private.h \
+       hb-unicode.c \
+       hb-unicode.h \
+       hb-unicode-private.h \
        hb-open-file-private.hh \
        hb-open-type-private.hh \
        hb-ot-layout.cc \
@@ -36,12 +42,13 @@ HBHEADERS = \
        $(NULL)
 
 libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
-libharfbuzz_la_LIBADD =
+libharfbuzz_la_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS)
+libharfbuzz_la_LIBADD = $(GLIB_LIBS)
 
 noinst_PROGRAMS = main
 
 main_SOURCES = main.cc
-main_CXXFLAGS = $(GLIB_CFLAGS)
+main_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS)
 main_LDADD = libharfbuzz.la $(GLIB_LIBS)
 
 EXTRA_DIST = README COPYING