X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-lang%2FMakefile.am;h=29cee59340ab93564c0319a9ff78356cc6d81378;hb=2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e;hp=f248e0ef33c60481e004aac365bb8843da5c471c;hpb=ffd6668b469508177c4baf7745ae42aee5b00322;p=fontconfig.git

diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index f248e0e..29cee59 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -7,9 +7,9 @@
 # documentation for any purpose is hereby granted without fee, provided that
 # the above copyright notice appear in all copies and that both that
 # copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Keith Packard not be used in
+# documentation, and that the name of the author(s) not be used in
 # advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission.  Keith Packard makes no
+# specific, written prior permission.  The authors make no
 # representations about the suitability of this software for any purpose.  It
 # is provided "as is" without express or implied warranty.
 #
@@ -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)
-	rm -f $(TARG)
+	$(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:
 #
@@ -181,7 +184,7 @@ ORTH = \
 	om.orth \
 	or.orth \
 	os.orth \
-	pa_in.orth \
+	pa.orth \
 	pl.orth \
 	ps_af.orth \
 	ps_pk.orth \
@@ -295,5 +298,6 @@ ORTH = \
 	su.orth \
 	ty.orth \
 	wal.orth \
-	za.orth
+	za.orth \
+	lah.orth
 #	^-------------- Add new orth files here