Move hb-view into util/

This commit is contained in:
Behdad Esfahbod 2011-08-09 15:03:00 +02:00
parent d753ac78da
commit 511a136f0c
5 changed files with 26 additions and 15 deletions

View File

@ -2,7 +2,7 @@
NULL = NULL =
SUBDIRS = src test SUBDIRS = src util test
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = harfbuzz.pc pkgconfig_DATA = harfbuzz.pc
@ -76,5 +76,4 @@ $(gpg_file): $(sha256_file)
release-files: $(tar_file) $(sha256_file) $(gpg_file) release-files: $(tar_file) $(sha256_file) $(gpg_file)
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

View File

@ -161,6 +161,7 @@ Makefile
harfbuzz.pc harfbuzz.pc
src/Makefile src/Makefile
src/hb-version.h src/hb-version.h
util/Makefile
test/Makefile test/Makefile
]) ])

View File

@ -149,19 +149,6 @@ hb-ot-shape-complex-indic-machine.hh: hb-ot-shape-complex-indic-machine.rl
noinst_PROGRAMS = main test noinst_PROGRAMS = main test
bin_PROGRAMS = 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_SOURCES = main.cc
main_CPPFLAGS = $(HBCFLAGS) main_CPPFLAGS = $(HBCFLAGS)
main_LDADD = libharfbuzz.la $(HBLIBS) main_LDADD = libharfbuzz.la $(HBLIBS)

24
util/Makefile.am Normal file
View File

@ -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