diff options
| -rw-r--r-- | doc/Makefile.am | 19 | ||||
| -rw-r--r-- | fc-arch/fcarch.tmpl.h | 2 | ||||
| -rw-r--r-- | fc-case/Makefile.am | 14 | ||||
| -rw-r--r-- | fc-glyphname/Makefile.am | 14 | ||||
| -rw-r--r-- | fc-lang/Makefile.am | 17 |
5 files changed, 38 insertions, 28 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 98121b11..8d7d5c8b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,10 +21,6 @@ # 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 @@ -83,7 +79,7 @@ DOC_FUNCS_SGML=\ fcstrset.sgml \ fcvalue.sgml -man5_MANS=fonts-conf.5 +man5_MANS=fonts-conf.5 man3_MANS=$(DOCMAN3) noinst_PROGRAMS=edit-sgml @@ -96,15 +92,20 @@ check_SCRIPTS=check-missing-doc TESTS_ENVIRONMENT=top_srcdir=${top_srcdir} sh TESTS=check-missing-doc -EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(check_SCRIPTS) func.sgml confdir.sgml.in +EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(DOC_FUNCS_SGML) $(check_SCRIPTS) func.sgml confdir.sgml.in SUFFIXES=.fncs .sgml .txt .html if USEDOCBOOK +if CROSS_COMPILING +.fncs.sgml: + @echo Warning: cannot rebuild $@ when cross-compiling +else .fncs.sgml: $(RM) $@ ./edit-sgml$(EXEEXT) $(FNCS_TMPL) < '$<' > $*.sgml +endif .sgml.txt: $(RM) $@ @@ -127,7 +128,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$(EXEEXT) $(FNCS_TMPL) +$(DOC_FUNCS_SGML): edit-sgml.c $(FNCS_TMPL) fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml $(RM) $@ @@ -140,9 +141,11 @@ local-fontconfig-user.sgml: fontconfig-user.sgml all-local: $(LOCAL_DOCS) clean-local: - $(RM) $(man3_MANS) $(man5_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs + $(RM) $(man3_MANS) $(man5_MANS) $(DOC_FILES) func.refs $(RM) -r $(HTML_DIR) +MAINTAINERCLEANFILES = $(DOC_FUNCS_SGML) + $(HTML_DIR): local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml $(RM) -r $(HTML_DIR) $(DOC2HTML) -V '%use-id-as-filename%' -o $(HTML_DIR) local-fontconfig-devel.sgml diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h index 868454e4..2f972ba4 100644 --- a/fc-arch/fcarch.tmpl.h +++ b/fc-arch/fcarch.tmpl.h @@ -29,7 +29,7 @@ @@@ use something reasonable and don't include any spaces @@@ @@@ So far the differences boil down to: endianness, 32 vs 64 bit pointers, -@@@ and on @@@ 32bit ones, whether double is aligned to one word or two words. +@@@ and on 32bit ones, whether double is aligned to one word or two words. @@@ Those result in the 6 formats listed below. @@@ @@@ ,name (endianness,pointer-size,double-alignment) diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am index e4621202..4f255fc7 100644 --- a/fc-case/Makefile.am +++ b/fc-case/Makefile.am @@ -22,10 +22,6 @@ # 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} $(WARN_CFLAGS) TMPL=fccase.tmpl.h @@ -44,12 +40,17 @@ fc_case_SRCS= \ CASEFOLDING=CaseFolding.txt SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt -EXTRA_DIST=$(TMPL) $(CASEFOLDING) +EXTRA_DIST = $(TARG) $(TMPL) $(CASEFOLDING) +if CROSS_COMPILING +$(TARG): $(STMPL) fc-case.c $(SCASEFOLDING) + @echo Warning: cannot rebuild $(TARG) when cross-compiling +else $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) +endif ALIAS_FILES = fcalias.h fcaliastail.h @@ -58,5 +59,6 @@ BUILT_SOURCES = $(ALIAS_FILES) $(ALIAS_FILES): touch $(ALIAS_FILES) -CLEANFILES=$(TARG) $(ALIAS_FILES) +CLEANFILES = $(ALIAS_FILES) +MAINTAINERCLEANFILES = $(TARG) diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index 4106b328..3799880e 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -22,10 +22,6 @@ # 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} $(WARN_CFLAGS) TMPL=fcglyphname.tmpl.h @@ -37,12 +33,17 @@ noinst_PROGRAMS=fc-glyphname GLYPHNAME=zapfdingbats.txt SGLYPHNAME=${top_srcdir}/fc-glyphname/zapfdingbats.txt -EXTRA_DIST=$(TMPL) $(GLYPHNAME) +EXTRA_DIST = $(TARG) $(TMPL) $(GLYPHNAME) +if CROSS_COMPILING +$(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) + @echo Warning: cannot rebuild $(TARG) when cross-compiling +else $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) +endif ALIAS_FILES = fcalias.h fcaliastail.h @@ -51,5 +52,6 @@ BUILT_SOURCES = $(ALIAS_FILES) $(TARG) $(ALIAS_FILES): touch $(ALIAS_FILES) -CLEANFILES=$(TARG) $(ALIAS_FILES) +CLEANFILES = $(ALIAS_FILES) +MAINTAINERCLEANFILES = $(TARG) diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am index 242fae0e..29cee593 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -22,10 +22,6 @@ # 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} $(WARN_CFLAGS) TMPL=fclang.tmpl.h @@ -36,21 +32,28 @@ noinst_PROGRAMS=fc-lang noinst_MANS=fc-lang.man -EXTRA_DIST=$(TMPL) $(ORTH) +EXTRA_DIST = $(TARG) $(TMPL) $(ORTH) +if CROSS_COMPILING +$(TARG):$(ORTH) fc-lang.c $(STMPL) + @echo Warning: cannot rebuild $(TARG) when cross-compiling +else $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) +endif ALIAS_FILES = fcalias.h fcaliastail.h BUILT_SOURCES = $(ALIAS_FILES) $(TARG) -$(ALIAS_FILES): +$(ALIAS_FILES): touch $(ALIAS_FILES) -CLEANFILES = $(TARG) $(ALIAS_FILES) +CLEANFILES = $(ALIAS_FILES) + +MAINTAINERCLEANFILES = $(TARG) # NOTE: # |