projects
/
platform
/
upstream
/
harfbuzz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.3.1
[platform/upstream/harfbuzz.git]
/
util
/
Makefile.am
diff --git
a/util/Makefile.am
b/util/Makefile.am
index
d4ab9cd
..
e24a6f3
100644
(file)
--- a/
util/Makefile.am
+++ b/
util/Makefile.am
@@
-11,6
+11,8
@@
include Makefile.sources
# Convenience targets:
lib:
@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
# Convenience targets:
lib:
@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+libs:
+ @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src libs
bin_PROGRAMS =
bin_PROGRAMS =
@@
-47,17
+49,16
@@
hb_shape_SOURCES = $(HB_SHAPE_sources)
bin_PROGRAMS += hb-shape
hb_subset_SOURCES = $(HB_SUBSET_CLI_sources)
bin_PROGRAMS += hb-shape
hb_subset_SOURCES = $(HB_SUBSET_CLI_sources)
-hb_subset_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
+hb_subset_LDADD = \
+ $(LDADD) \
+ $(top_builddir)/src/libharfbuzz-subset.la
bin_PROGRAMS += hb-subset
bin_PROGRAMS += hb-subset
-if HAVE_OT
hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
bin_PROGRAMS += hb-ot-shape-closure
hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
bin_PROGRAMS += hb-ot-shape-closure
-endif # HAVE_OT
endif # HAVE_GLIB
endif # HAVE_GLIB
-#if HAVE_OT
#if HAVE_FONTCONFIG
#hb_fc_list_SOURCES = \
# hb-fc.cc \
#if HAVE_FONTCONFIG
#hb_fc_list_SOURCES = \
# hb-fc.cc \
@@
-70,6
+71,5
@@
endif # HAVE_GLIB
# $(NULL)
#bin_PROGRAMS += hb-fc-list
#endif # HAVE_FONTCONFIG
# $(NULL)
#bin_PROGRAMS += hb-fc-list
#endif # HAVE_FONTCONFIG
-#endif # HAVE_OT
-include $(top_srcdir)/git.mk
-include $(top_srcdir)/git.mk