From d0f70707dde032e662dbd5bc70df6ac915403abe Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 8 Sep 2014 23:42:34 +0200
Subject: Updated to libXfont 1.5.0

---
 libXfont/src/bitmap/Makefile.in | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'libXfont/src/bitmap/Makefile.in')

diff --git a/libXfont/src/bitmap/Makefile.in b/libXfont/src/bitmap/Makefile.in
index 5aa1a4a7b..4f654aa67 100644
--- a/libXfont/src/bitmap/Makefile.in
+++ b/libXfont/src/bitmap/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,6 +78,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@XFONT_BDFFORMAT_TRUE@am__append_1 = bdfread.c bdfutils.c
+@XFONT_PCF_OR_BUILTIN_TRUE@am__append_2 = pcfread.c
+@XFONT_PCFFORMAT_TRUE@am__append_3 = pcfwrite.c
+@XFONT_SNFFORMAT_TRUE@am__append_4 = snfread.c snfstr.h
 subdir = src/bitmap
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
@@ -92,9 +96,16 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libbitmap_la_LIBADD =
-am_libbitmap_la_OBJECTS = bdfread.lo bdfutils.lo bitmap.lo \
-	bitmapfunc.lo bitmaputil.lo bitscale.lo fontink.lo pcfread.lo \
-	pcfwrite.lo snfread.lo
+am__libbitmap_la_SOURCES_DIST = bitmap.c bitmapfunc.c bitmaputil.c \
+	bitscale.c fontink.c bdfread.c bdfutils.c pcfread.c pcfwrite.c \
+	snfread.c snfstr.h
+@XFONT_BDFFORMAT_TRUE@am__objects_1 = bdfread.lo bdfutils.lo
+@XFONT_PCF_OR_BUILTIN_TRUE@am__objects_2 = pcfread.lo
+@XFONT_PCFFORMAT_TRUE@am__objects_3 = pcfwrite.lo
+@XFONT_SNFFORMAT_TRUE@am__objects_4 = snfread.lo
+am_libbitmap_la_OBJECTS = bitmap.lo bitmapfunc.lo bitmaputil.lo \
+	bitscale.lo fontink.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4)
 libbitmap_la_OBJECTS = $(am_libbitmap_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -135,7 +146,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libbitmap_la_SOURCES)
-DIST_SOURCES = $(libbitmap_la_SOURCES)
+DIST_SOURCES = $(am__libbitmap_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -315,19 +326,9 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
 noinst_LTLIBRARIES = libbitmap.la
-libbitmap_la_SOURCES = \
-	bdfread.c		\
-	bdfutils.c		\
-	bitmap.c		\
-	bitmapfunc.c		\
-	bitmaputil.c		\
-	bitscale.c		\
-	fontink.c		\
-	pcfread.c		\
-	pcfwrite.c		\
-	snfread.c		\
-	snfstr.h
-
+libbitmap_la_SOURCES = bitmap.c bitmapfunc.c bitmaputil.c bitscale.c \
+	fontink.c $(am__append_1) $(am__append_2) $(am__append_3) \
+	$(am__append_4)
 all: all-am
 
 .SUFFIXES:
-- 
cgit v1.2.3