diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2013-01-02 20:08:40 -0600 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2013-01-02 20:09:05 -0600 |
| commit | bc62c40597c3d95edfdc6a93b39d0bb3837d1d34 (patch) | |
| tree | 556069a694ab2c83d3315e08ec6ba5dfdcdcf5c0 /fc-glyphname | |
| parent | 32c1d32cbd54686804481fedaa1881d4f3043f1b (diff) | |
Really fix cross-compiling and building of tools this time
Diffstat (limited to 'fc-glyphname')
| -rw-r--r-- | fc-glyphname/Makefile.am | 47 | ||||
| -rw-r--r-- | fc-glyphname/fc-glyphname.c | 2 |
2 files changed, 9 insertions, 40 deletions
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index 3ddd53a..1272567 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -1,8 +1,7 @@ # -*- encoding: utf-8 -*- # -# $Id $ -# -# Copyright © 2003 Keith Packard +# Copyright © 2003 Keith Packard +# Copyright © 2013 Google, Inc. # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that @@ -22,43 +21,13 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # +# Google Author(s): Behdad Esfahbod -INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -TMPL=fcglyphname.tmpl.h -STMPL=${top_srcdir}/fc-glyphname/${TMPL} -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) - -## BUILT_SOURCES doesn't effect to 'distcheck' -## so $(ALIAS_FILES) has to be appeared prior to fc-glyphname$(EXEEXT) -## to make sure availability. -$(TARG): $(STMPL) $(ALIAS_FILES) fc-glyphname$(EXEEXT) $(SGLYPHNAME) - $(AM_V_GEN) $(RM) $(TARG); \ - ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ - mv $(TARG).tmp $(TARG) - -ALIAS_FILES = fcalias.h fcaliastail.h - -BUILT_SOURCES = $(ALIAS_FILES) - -$(ALIAS_FILES): - $(AM_V_GEN) touch $@ - -CLEANFILES = $(ALIAS_FILES) - -DISTCLEANFILES = $(TARG) +TAG = glyphname +DEPS = $(srcdir)/zapfdingbats.txt +ARGS = $(srcdir)/zapfdingbats.txt +DIST = $(srcdir)/zapfdingbats.txt -MAINTAINERCLEANFILES = $(TARG) +include $(top_srcdir)/Tools.mk -include $(top_srcdir)/git.mk diff --git a/fc-glyphname/fc-glyphname.c b/fc-glyphname/fc-glyphname.c index 9085f2d..8402781 100644 --- a/fc-glyphname/fc-glyphname.c +++ b/fc-glyphname/fc-glyphname.c @@ -231,7 +231,7 @@ dump (FcGlyphName * const *table, const char *name) } int -main (int argc, char **argv) +main (int argc FC_UNUSED, char **argv) { char *files[MAX_GLYPHFILE]; char line[1024]; |