diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2013-01-02 17:49:41 -0600 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2013-01-02 17:49:41 -0600 |
| commit | 558b3c65f91b4b2dd65ce2242e1a21ace621e44b (patch) | |
| tree | aac8864b099927ed435c7c055448b73c70517946 /fc-glyphname | |
| parent | ec8a40d2381014ad2e72b5da0e6357a85f078f9f (diff) | |
Use CC_FOR_BUILD to generate source files
Previously we were failing if CROSS_COMPILING and the generated headers
were not present. It works just fine now.
One caveat: the fix is not fully correct since config.h is being
included in the files built with CC_FOR_BUILD, but config.h has config
for the host system, not the build system. Should be fine though.
Diffstat (limited to 'fc-glyphname')
| -rw-r--r-- | fc-glyphname/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index f6aeea75..3ddd53a1 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -31,15 +31,15 @@ TARG=fcglyphname.h noinst_PROGRAMS=fc-glyphname +noinst_HEADERS=$(TARG) + +fc_glyphname_CC = $(CC_FOR_BUILD) + GLYPHNAME=zapfdingbats.txt SGLYPHNAME=${top_srcdir}/fc-glyphname/zapfdingbats.txt EXTRA_DIST = $(TARG) $(TMPL) $(GLYPHNAME) -if CROSS_COMPILING -$(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) - @echo Warning: cannot rebuild $(TARG) when cross-compiling -else ## BUILT_SOURCES doesn't effect to 'distcheck' ## so $(ALIAS_FILES) has to be appeared prior to fc-glyphname$(EXEEXT) ## to make sure availability. @@ -47,7 +47,6 @@ $(TARG): $(STMPL) $(ALIAS_FILES) 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 |