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

Use AM_MISSING_PROG for ragel and git

This commit is contained in:
Behdad Esfahbod 2014-03-04 13:03:51 -08:00
parent a82165248c
commit bb8ffb581b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -28,8 +28,8 @@ CHANGELOG_RANGE =
ChangeLog: $(srcdir)/ChangeLog ChangeLog: $(srcdir)/ChangeLog
$(srcdir)/ChangeLog: $(srcdir)/ChangeLog:
$(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \ $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \
(GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run \ (GIT_DIR=$(top_srcdir)/.git \
git log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \ $(GIT) log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp "$(srcdir)/ChangeLog" \ && mv -f $@.tmp "$(srcdir)/ChangeLog" \
|| ($(RM) $@.tmp; \ || ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \

2
configure.ac
View File

@ -23,6 +23,8 @@ AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CXX AC_PROG_CXX
PKG_PROG_PKG_CONFIG([0.20]) PKG_PROG_PKG_CONFIG([0.20])
AM_MISSING_PROG([RAGEL], [ragel])
AM_MISSING_PROG([GIT], [git])
# Version # Version
m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]])) m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]]))

2
src/Makefile.am
View File

@ -302,7 +302,7 @@ EXTRA_DIST += \
hb-ot-shape-complex-sea-machine.rl \ hb-ot-shape-complex-sea-machine.rl \
$(NULL) $(NULL)
.rl.hh: .rl.hh:
$(AM_V_GEN)$(top_srcdir)/missing --run ragel -e -F1 -o "$@.tmp" "$<" && \ $(AM_V_GEN)$(RAGEL) -e -F1 -o "$@.tmp" "$<" && \
mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false ) mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false )
noinst_PROGRAMS = \ noinst_PROGRAMS = \