From 511a136f0c092880b19250a5df53bcf9f4b043ca Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 9 Aug 2011 15:03:00 +0200
Subject: [PATCH] Move hb-view into util/

---
 Makefile.am              |  3 +--
 configure.ac             |  1 +
 src/Makefile.am          | 13 -------------
 util/Makefile.am         | 24 ++++++++++++++++++++++++
 {src => util}/hb-view.cc |  0
 5 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 util/Makefile.am
 rename {src => util}/hb-view.cc (100%)

diff --git a/Makefile.am b/Makefile.am
index bb68ede8e..8b69c2d78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 NULL =
 
-SUBDIRS = src test
+SUBDIRS = src util test
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = harfbuzz.pc
@@ -76,5 +76,4 @@ $(gpg_file): $(sha256_file)
 release-files: $(tar_file) $(sha256_file) $(gpg_file)
 
 
-
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 3f13c4365..d960856d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,7 @@ Makefile
 harfbuzz.pc
 src/Makefile
 src/hb-version.h
+util/Makefile
 test/Makefile
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b0307a1a..62a5b398a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,19 +149,6 @@ hb-ot-shape-complex-indic-machine.hh: hb-ot-shape-complex-indic-machine.rl
 noinst_PROGRAMS = main test
 bin_PROGRAMS =
 
-if HAVE_GLIB
-if HAVE_FREETYPE
-if HAVE_CAIRO_FT
-if HAVE_CAIRO_PNG
-hb_view_SOURCES = hb-view.cc
-hb_view_CPPFLAGS = $(HBCFLAGS) $(CAIRO_FT_CFLAGS) $(CAIRO_PNG_CFLAGS)
-hb_view_LDADD = libharfbuzz.la -lm $(HBLIBS) $(CAIRO_FT_LIBS) $(CAIRO_PNG_LIBS)
-bin_PROGRAMS += hb-view
-endif
-endif
-endif
-endif
-
 main_SOURCES = main.cc
 main_CPPFLAGS = $(HBCFLAGS)
 main_LDADD = libharfbuzz.la $(HBLIBS)
diff --git a/util/Makefile.am b/util/Makefile.am
new file mode 100644
index 000000000..a3ae9806e
--- /dev/null
+++ b/util/Makefile.am
@@ -0,0 +1,24 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+EXTRA_DIST =
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+
+bin_PROGRAMS =
+
+if HAVE_GLIB
+if HAVE_FREETYPE
+if HAVE_CAIRO_FT
+if HAVE_CAIRO_PNG
+hb_view_SOURCES = hb-view.cc
+hb_view_CPPFLAGS = -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(FREETYPE_CFLAGS) $(CAIRO_FT_CFLAGS) $(CAIRO_PNG_CFLAGS)
+hb_view_LDADD = $(top_builddir)/src/libharfbuzz.la -lm $(GLIB_LIBS) $(FREETYPE_LIBS) $(CAIRO_FT_LIBS) $(CAIRO_PNG_LIBS)
+bin_PROGRAMS += hb-view
+endif
+endif
+endif
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/hb-view.cc b/util/hb-view.cc
similarity index 100%
rename from src/hb-view.cc
rename to util/hb-view.cc