From bc62c40597c3d95edfdc6a93b39d0bb3837d1d34 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 2 Jan 2013 20:08:40 -0600
Subject: Really fix cross-compiling and building of tools this time

---
 fc-lang/Makefile.am | 44 ++++++++------------------------------------
 fc-lang/fc-lang.c   |  8 ++++----
 2 files changed, 12 insertions(+), 40 deletions(-)

(limited to 'fc-lang')

diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index 536cff27..2340de4a 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/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,41 +21,14 @@
 # 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=fclang.tmpl.h
-STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
-TARG=fclang.h
-
-noinst_PROGRAMS=fc-lang
-
-noinst_HEADERS=$(TARG)
-
-fc_lang_CC = $(CC_FOR_BUILD)
-
-EXTRA_DIST = $(TARG) $(TMPL) $(ORTH)
-
-## BUILT_SOURCES doesn't effect to 'distcheck'
-## so $(ALIAS_FILES) has to be appeared prior to fc-lang$(EXEEXT)
-## to make sure availability.
-$(TARG):$(ORTH) $(ALIAS_FILES) fc-lang${EXEEXT} $(STMPL)
-	$(AM_V_GEN) $(RM) $(TARG); \
-	./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(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 = lang
+DEPS = $(ORTH)
+ARGS = -d $(srcdir) $(ORTH)
+DIST = $(ORTH)
 
-MAINTAINERCLEANFILES = $(TARG)
+include $(top_srcdir)/Tools.mk
 
 # NOTE:
 #
diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 83b13e11..0f4217f7 100644
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -38,17 +38,17 @@
  */
 
 FcPrivate void
-FcCacheObjectReference (void *object)
+FcCacheObjectReference (void *object FC_UNUSED)
 {
 }
 
 FcPrivate void
-FcCacheObjectDereference (void *object)
+FcCacheObjectDereference (void *object FC_UNUSED)
 {
 }
 
 FcPrivate FcChar8 *
-FcLangNormalize (const FcChar8 *lang)
+FcLangNormalize (const FcChar8 *lang FC_UNUSED)
 {
     return NULL;
 }
@@ -252,7 +252,7 @@ static int compare (const void *a, const void *b)
 #define BitSet(map, i)   ((map)[(entries[i].id)>>5] |= ((FcChar32) 1 << ((entries[i].id) & 0x1f)))
 
 int
-main (int argc, char **argv)
+main (int argc FC_UNUSED, char **argv)
 {
     static Entry	entries[MAX_LANG];
     static FcCharSet	*sets[MAX_LANG];
-- 
cgit v1.2.3