Commit d8ae9c92 authored by Keith Packard's avatar Keith Packard

Add SEE ALSO section (bug 2085)

Cross compiling fixes (bug 280)
reviewed by: Keith Packard <keithp@keithp.com>
parent 8759822e
2005-01-13 Keith Packard <keithp@keithp.com>
* doc/fontconfig-user.sgml:
Add SEE ALSO section (bug 2085)
2005-01-13 J. Ali Harlow <ali@juiblex.co.uk>
reviewed by: Keith Packard <keithp@keithp.com>
* Makefile.am:
* configure.in:
* doc/Makefile.am:
* fc-case/Makefile.am:
* fc-glyphname/Makefile.am:
* fc-lang/Makefile.am:
* src/fontconfig.def.in:
Cross compiling fixes (bug 280)
2005-01-13 Keith Packard <keithp@keithp.com>
* fonts.conf.in:
......
......@@ -39,6 +39,12 @@ pkgconfig_DATA = fontconfig.pc
configdir=$(CONFDIR)
config_DATA=fonts.dtd
if CROSS_COMPILING
RUN_FC_CACHE_TEST=false
else
RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
endif
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(configdir)
if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
......@@ -61,7 +67,16 @@ install-data-local:
echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
$(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
fi; fi; fi
if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
if $(RUN_FC_CACHE_TEST); then \
echo " fc-cache/fc-cache -f -v"; \
fc-cache/fc-cache -f -v; \
else \
echo "***"; \
echo "*** Warning: fonts.cache not built"; \
echo "***"; \
echo "*** Generate this file manually on host system using fc-cache"; \
echo "***"; \
fi
uninstall-local:
if [ -f $(srcdir)/fonts.conf ]; then \
......
......@@ -88,6 +88,50 @@ AC_SUBST(WARN_CFLAGS)
dnl ==========================================================================
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
dnl ==========================================================================
# Setup for compiling build tools (fc-glyphname, etc)
AC_MSG_CHECKING([for a C compiler for build tools])
if test $cross_compiling = yes; then
AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
else
CC_FOR_BUILD=$CC
fi
AC_MSG_RESULT([$CC_FOR_BUILD])
AC_SUBST(CC_FOR_BUILD)
AC_MSG_CHECKING([for suffix of executable build tools])
if test $cross_compiling = yes; then
cat >conftest.c <<\_______EOF
int
main ()
{
exit (0);
}
_______EOF
for i in .exe ""; do
compile="$CC_FOR_BUILD conftest.c -o conftest$i"
if AC_TRY_EVAL(compile); then
if (./conftest) 2>&AC_FD_CC; then
EXEEXT_FOR_BUILD=$i
break
fi
fi
done
rm -f conftest*
if test "${EXEEXT_FOR_BUILD+set}" != set; then
AC_MSG_ERROR([Cannot determine suffix of executable build tools])
fi
else
EXEEXT_FOR_BUILD=$EXEEXT
fi
AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
AC_SUBST(EXEEXT_FOR_BUILD)
dnl ==========================================================================
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
......
......@@ -21,6 +21,10 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
CC = @CC_FOR_BUILD@
EXEEXT = @EXEEXT_FOR_BUILD@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DOC_SRC = $(srcdir)
DOC_MODULE = fontconfig
DOC2HTML = docbook2html
......@@ -87,7 +91,7 @@ if USEDOCBOOK
.fncs.sgml:
$(RM) $@
./edit-sgml $(FNCS_TMPL) < '$<' > $*.sgml
./edit-sgml$(EXEEXT) $(FNCS_TMPL) < '$<' > $*.sgml
.sgml.txt:
$(RM) $@
......@@ -104,7 +108,7 @@ func.refs: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sg
local-fontconfig-devel.sgml: fontconfig-devel.sgml
$(LN_S) $< $@
$(DOC_FUNCS_SGML): edit-sgml $(FNCS_TMPL)
$(DOC_FUNCS_SGML): edit-sgml$(EXEEXT) $(FNCS_TMPL)
fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
$(RM) $@
......
......@@ -575,6 +575,11 @@ is the conventional repository of font information that isn't found in the
per-directory caches. This file is automatically maintained by fontconfig.
</para>
</refsect1>
<refsect1><title>See Also</title>
<para>
fc-cache(1), fc-match(1), fc-list(1)
</para>
</refsect1>
<refsect1><title>Version</title>
<para>
Fontconfig version &version;
......
......@@ -22,6 +22,10 @@
# PERFORMANCE OF THIS SOFTWARE.
#
CC = @CC_FOR_BUILD@
EXEEXT = @EXEEXT_FOR_BUILD@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
TMPL=fccase.tmpl.h
......@@ -44,9 +48,9 @@ SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt
EXTRA_DIST=$(TMPL) $(CASEFOLDING)
$(TARG): $(STMPL) fc-case $(SCASEFOLDING)
$(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
rm -f $(TARG)
./fc-case $(SCASEFOLDING) < $(STMPL) > $(TARG)
./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG)
CLEANFILES=$(TARG)
......@@ -22,6 +22,10 @@
# PERFORMANCE OF THIS SOFTWARE.
#
CC = @CC_FOR_BUILD@
EXEEXT = @EXEEXT_FOR_BUILD@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
TMPL=fcglyphname.tmpl.h
......@@ -39,9 +43,9 @@ SGLYPHNAME=${top_srcdir}/fc-glyphname/zapfdingbats.txt
EXTRA_DIST=$(TMPL) $(GLYPHNAME)
$(TARG): $(STMPL) fc-glyphname $(SGLYPHNAME)
$(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
rm -f $(TARG)
./fc-glyphname $(SGLYPHNAME) < $(STMPL) > $(TARG)
./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG)
CLEANFILES=$(TARG)
......@@ -22,6 +22,10 @@
# PERFORMANCE OF THIS SOFTWARE.
#
CC = @CC_FOR_BUILD@
EXEEXT = @EXEEXT_FOR_BUILD@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
TMPL=fclang.tmpl.h
......@@ -38,8 +42,8 @@ ORTH=@ORTH_FILES@
EXTRA_DIST=$(TMPL) $(ORTH)
$(TARG):$(ORTH) fc-lang $(STMPL)
$(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
rm -f $(TARG)
./fc-lang -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
CLEANFILES=$(TARG)
......@@ -159,5 +159,5 @@ EXPORTS
FcValueEqual
FcValuePrint
FcValueSave
LIBRARY fontconfig
LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@
VERSION @LT_CURRENT@.@LT_REVISION@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment