walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[build] Fix EXTRA_DIST 

I was under the impression that EXTRA_DISTs will happen regardless of
automake conditionals.  Apparently I was wrong.
This commit is contained in:
Behdad Esfahbod 2013-09-03 20:00:16 -04:00
parent 1e994a8fcc
commit 213001aa99
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.am
View File

@ -198,8 +198,8 @@ libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_IN
libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la
pkginclude_HEADERS += hb-icu.h pkginclude_HEADERS += hb-icu.h
pkgconfig_DATA += harfbuzz-icu.pc pkgconfig_DATA += harfbuzz-icu.pc
EXTRA_DIST += harfbuzz-icu.pc.in
endif endif
EXTRA_DIST += harfbuzz-icu.pc.in
if HAVE_GOBJECT if HAVE_GOBJECT
lib_LTLIBRARIES += libharfbuzz-gobject.la lib_LTLIBRARIES += libharfbuzz-gobject.la
@ -211,16 +211,11 @@ libharfbuzz_gobject_la_LIBADD = $(GOBJECT_LIBS) libharfbuzz.la
pkginclude_HEADERS += hb-gobject.h hb-gobject-structs.h pkginclude_HEADERS += hb-gobject.h hb-gobject-structs.h
nodist_pkginclude_HEADERS += hb-gobject-enums.h nodist_pkginclude_HEADERS += hb-gobject-enums.h
pkgconfig_DATA += harfbuzz-gobject.pc pkgconfig_DATA += harfbuzz-gobject.pc
EXTRA_DIST += harfbuzz-gobject.pc.in
BUILT_SOURCES += \ BUILT_SOURCES += \
hb-gobject-enums.cc \ hb-gobject-enums.cc \
hb-gobject-enums.h \ hb-gobject-enums.h \
$(NULL) $(NULL)
EXTRA_DIST += \
hb-gobject-enums.cc.tmpl \
hb-gobject-enums.h.tmpl \
$(NULL)
DISTCLEANFILES += \ DISTCLEANFILES += \
hb-gobject-enums.cc \ hb-gobject-enums.cc \
hb-gobject-enums.h \ hb-gobject-enums.h \
@ -232,6 +227,11 @@ hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS)
sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@.tmp" && \ sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@.tmp" && \
mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false ) mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false )
endif endif
EXTRA_DIST += \
harfbuzz-gobject.pc.in \
hb-gobject-enums.cc.tmpl \
hb-gobject-enums.h.tmpl \
$(NULL)
%.pc: %.pc.in $(top_builddir)/config.status %.pc: %.pc.in $(top_builddir)/config.status