src/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
New commits: commit 9de5f98f363d96f308adc33f1c2286e5c33117de Author: Behdad Esfahbod <[email protected]> Date: Mon Feb 4 23:28:22 2013 -0500 Bug 60035 - intermittent make install failure on hb-version.h diff --git a/src/Makefile.am b/src/Makefile.am index 79a91d7..a5c888a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,6 +63,8 @@ HBHEADERS = \ hb-shape.h \ hb-shape-plan.h \ hb-unicode.h \ + $(NULL) +HBNODISTHEADERS = \ hb-version.h \ $(NULL) @@ -207,17 +209,17 @@ endif endif endif -libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) +libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES) libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined libharfbuzz_la_LIBADD = $(HBLIBS) EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) pkginclude_HEADERS = $(HBHEADERS) -nodist_pkginclude_HEADERS = hb-version.h +nodist_pkginclude_HEADERS = $(HBNODISTHEADERS) CLEANFILES += harfbuzz.def -harfbuzz.def: $(HBHEADERS) +harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) $(AM_V_GEN) (echo EXPORTS; \ (cat $^ || echo 'hb_ERROR ()' ) | \ $(EGREP) '^hb_.* \(' | \ @@ -296,7 +298,7 @@ TESTS_ENVIRONMENT = \ srcdir="$(srcdir)" \ MAKE="$(MAKE) $(AM_MAKEFLAGS)" \ HBSOURCES="$(HBSOURCES)" \ - HBHEADERS="$(HBHEADERS)" \ + HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \ $(NULL) #-include $(INTROSPECTION_MAKEFILE) @@ -310,7 +312,7 @@ TESTS_ENVIRONMENT = \ #hb_1_0_gir_INCLUDES = GObject-2.0 #hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN #hb_1_0_gir_LIBS = libharfbuzz.la -#hb_1_0_gir_FILES = $(HBHEADERS) +#hb_1_0_gir_FILES = $(HBHEADERS) $(HBNODISTHEADERS) # #girdir = $(datadir)/gir-1.0 #gir_DATA = $(INTROSPECTION_GIRS) _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
