From e1c68a679e675cde4066be7eb3ad67f33cb41899 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 2 Sep 2009 19:44:58 +0000
Subject: Switched to font-util-1.0.2.tar.gz

---
 xorg-server/fonts.src/font-util/Makefile.am | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'xorg-server/fonts.src/font-util/Makefile.am')

diff --git a/xorg-server/fonts.src/font-util/Makefile.am b/xorg-server/fonts.src/font-util/Makefile.am
index d9d581bdd..fe23e3446 100644
--- a/xorg-server/fonts.src/font-util/Makefile.am
+++ b/xorg-server/fonts.src/font-util/Makefile.am
@@ -19,14 +19,12 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-bin_PROGRAMS = ucs2any
-bin_SCRIPTS = bdftruncate
+bin_PROGRAMS = bdftruncate ucs2any
 
-ucs2any_SOURCES = ucs2any.c
+AM_CFLAGS = $(CWARNFLAGS)
 
-bdftruncate: $(top_srcdir)/bdftruncate.pl
-	@rm -f $@
-	cp $(top_srcdir)/bdftruncate.pl $@
+ucs2any_SOURCES = ucs2any.c
+bdftruncate_SOURCES = bdftruncate.c
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = fontutil.m4
@@ -62,8 +60,6 @@ CLEANFILES = bdftruncate $(appman_DATA)
 
 EXTRA_DIST = $(mapfiles_DATA) \
 	$(appman_PRE) \
-	autogen.sh \
-	bdftruncate.pl \
 	fontutil.pc.in \
 	$(aclocal_DATA)
 
@@ -81,3 +77,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
-- 
cgit v1.2.3