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

Second try to make Sun CPP happy

This commit is contained in:
Behdad Esfahbod 2013-01-02 20:16:55 -06:00
parent bc62c40597
commit 86e3255118
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile.am
View File

@ -104,17 +104,19 @@ noinst_PROGRAMS = fcarch
cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h
fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
$(AM_V_GEN) $(CPP) -I$(top_srcdir) $< | $(GREP) '^[^#]' | awk ' \ $(AM_V_GEN) $(CPP) -I$(top_srcdir) $< | \
/CUT_OUT_BEGIN/ { no_write=1; next; }; \ $(SED) 's/^ *//;s/ *, */,/' | \
/CUT_OUT_END/ { no_write=0; next; }; \ $(GREP) '^[^#]' | \
{ if (!no_write) print; next; }; \ awk ' \
' - | \ /CUT_OUT_BEGIN/ { no_write=1; next; }; \
sed 's/^ *//;s/ *, */,/' > $@.tmp && \ /CUT_OUT_END/ { no_write=0; next; }; \
mv -f $@.tmp $@ { if (!no_write) print; next; }; \
' - > $@.tmp && \
mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
fcobjshash.h: fcobjshash.gperf fcobjshash.h: fcobjshash.gperf
$(AM_V_GEN) $(top_srcdir)/missing --run gperf -m 100 $< > $@.tmp && \ $(AM_V_GEN) $(top_srcdir)/missing --run gperf -m 100 $< > $@.tmp && \
mv -f $@.tmp $@ mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
EXTRA_DIST += \ EXTRA_DIST += \
fcobjshash.gperf.h \ fcobjshash.gperf.h \
@ -199,10 +201,10 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
echo Generating $@ echo Generating $@
(echo EXPORTS; \ (echo EXPORTS; \
(cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \ (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/ /' | \ $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \
sort; \ sort; \
echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@ echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
@ ! grep -q FcERROR $@ || ($(RM) $@; false) @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk