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

[make] Revert the way harfbuzz.cc and hb-version.h are generated 

Partially reverts 4fc6189
This commit is contained in:
Ebrahim Byagowi 2020-07-04 03:34:58 +04:30 committed by GitHub
parent 1853f84abc
commit 63322513e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile.am
View File

@ -98,7 +98,12 @@ BUILT_SOURCES += \
hb-version.h hb-version.h
$(srcdir)/hb-version.h: hb-version.h.in $(top_srcdir)/configure.ac $(srcdir)/hb-version.h: hb-version.h.in $(top_srcdir)/configure.ac
$(AM_V_GEN) $(srcdir)/gen-hb-version.py $(HB_VERSION) hb-version.h.in hb-version.h $(AM_V_GEN) $(srcdir)/gen-hb-version.py $(HB_VERSION) "$<" "$@" \
-e 's/[@]HB_VERSION_MAJOR@/$(HB_VERSION_MAJOR)/' \
-e 's/[@]HB_VERSION_MINOR@/$(HB_VERSION_MINOR)/' \
-e 's/[@]HB_VERSION_MICRO@/$(HB_VERSION_MICRO)/' \
-e 's/[@]HB_VERSION@/$(HB_VERSION)/' \
"$<" > "$@" || ($(RM) "$@"; false)
# Put the library together # Put the library together
@ -277,7 +282,7 @@ $(srcdir)/%.hh: $(srcdir)/%.rl
harfbuzz.cc: Makefile.sources harfbuzz.cc: Makefile.sources
$(AM_V_GEN) \ $(AM_V_GEN) \
$(srcdir)/gen-harfbuzzcc.py harfbuzz.cc \ for f in \
$(HB_BASE_sources) \ $(HB_BASE_sources) \
$(HB_GLIB_sources) \ $(HB_GLIB_sources) \
$(HB_FT_sources) \ $(HB_FT_sources) \
@ -285,7 +290,10 @@ harfbuzz.cc: Makefile.sources
$(HB_UNISCRIBE_sources) \ $(HB_UNISCRIBE_sources) \
$(HB_GDI_sources) \ $(HB_GDI_sources) \
$(HB_DIRECTWRITE_sources) \ $(HB_DIRECTWRITE_sources) \
$(HB_CORETEXT_sources) $(HB_CORETEXT_sources) \
; do echo '#include "'$$f'"'; done | \
grep '[.]cc"' > $(srcdir)/harfbuzz.cc \
|| ($(RM) $(srcdir)/harfbuzz.cc; false)
BUILT_SOURCES += harfbuzz.cc BUILT_SOURCES += harfbuzz.cc
noinst_PROGRAMS = \ noinst_PROGRAMS = \