diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-12-27 13:20:47 -0600 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-12-27 13:20:47 -0600 |
| commit | 2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e (patch) | |
| tree | dd21848ab8cff2b1848f8c35d13ab57b663ed584 /fc-glyphname | |
| parent | 0d47cfabd82cd9c02ec5711383f06599b0450ac0 (diff) | |
| download | fontconfig-2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e.tar.gz | |
Make most generated-files cross-compiling-safe
By simply including a copy in the tarball.
Remains fc-arch which is trickier.
Diffstat (limited to 'fc-glyphname')
| -rw-r--r-- | fc-glyphname/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index 4106b32..3799880 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) |