* Update to bitmap 1.0.3.

2007-02-11 07:05:57 +01:00 · 2007-02-11 07:05:57 +01:00 · c254f6f15a
parent c26e1662c6
commit c254f6f15a
14 changed files with 1817 additions and 1626 deletions
--- a/bitmap/ChangeLog
+++ b/bitmap/ChangeLog
@ -1,51 +1,267 @@
-2006-05-12  Adam Jackson  <ajax@freedesktop.org>
+commit 0fa2f5aa4b0e62ceb4685123182bf018c27e293a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 23 13:42:25 2007 -0800

-	* configure.ac:
-	Bump to 1.0.2
+    Version bump: 1.0.3

-2006-05-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 4d02bf25b4e64d0a3fb2270491d3dbe4fc18effc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 23 13:42:01 2007 -0800

-	* Makefile.am:
-	Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
-	Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
+    Replace static changelog with dist-hook to generate from git log

-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 2c5045d72ee4120c52cfc7e008237a438a1c2d30
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 22 19:45:08 2007 -0800

-	* configure.ac:
-	Update package version for X11R7 release.
+    Remove on/off form of options from bitmap.man man page
+    
+    Turns out the previous formatting error that hid these was an attempt
+    to comment them out since they aren't implemented, so we'll just delete them.

-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 5c1c01c8222eac13e9a65a36d3b953ae6f75ae6b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 2 14:37:42 2007 -0800

-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    renamed: .cvsignore -> .gitignore

-2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit ad55b1108f61ae0e3643bdffe430c71973d3d7ae
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Tue Jan 2 14:34:17 2007 -0800

-	* Makefile.am:
-	* configure.ac:
-	Change to use the app-defaults default dir configured in libXt.
+    Bug 9511: Garbled macro invocation in bitmap.1x manual page.
+    
+    <https://bugs.freedesktop.org/show_bug.cgi?id=9511>

-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 3537d2121dcc68e3ecb93eaa2b341d759b0fbc88
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri May 12 16:19:54 2006 +0000

-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Bump to 1.0.2

-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit d8f719a352cd4d4ace60566b73a077175940a351
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue May 9 21:55:08 2006 +0000

-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628> Shadow pages
+        not created correctly when MANDIR & MANSUFFIX don't match.

-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 545a878fa367a32059b33a21b9253a69ed95ccf6
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:42 2005 +0000

-	* configure.ac:
-	Update package version number for RC1 release.
+    Update package version for X11R7 release.

-2005-10-13  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit 038d4cc67674fcecd638489625cedfdc57f4bcea
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:39 2005 +0000

-	* Makefile.am: 
-	Add shadow man pages for atobm and bmtoa.
+    Stub COPYING files

-2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit ab8a9596b7c9729914b1444208521e939f35535f
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:01 2005 +0000

-	* Makefile.am:
-	Add bitmap.icon to EXTRA_DIST
+    Update package version number for final X11R7 release candidate.
+
+commit d1ae6091d49c8af843e6895cb438225078a0f797
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 7 16:17:58 2005 +0000
+
+    Change to use the app-defaults default dir configured in libXt.
+
+commit 07cfe6f6de483aefcc18836fd3f03bdc5d6cd823
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:16 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit f0e1e5f67882635777fa9a25496265a661c40a02
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:15 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit d1dac2d6d7470212e3b2366702923a03950b9834
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:36 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit c361bb94796e409437ac71714c9a3746da0136dc
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:34:55 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit eb1544cfc467a48074e11118a85fec3b4980460d
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:47 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit 0909ff9192c30720ce6a82043d10b4f7ce6fab83
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:47 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 905ded4a3825727326ccacd48a76ca221ff59a81
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Oct 18 00:32:54 2005 +0000
+
+    Change default install dir for app-default files from
+        $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+        the monolith & allow localization
+
+commit fde7c43f092eba195a4a93391d9518f321ec9e40
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:19 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 0dbcf2d9436b3860ed33563e0f2daf0b2bc78dd9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 21:13:15 2005 +0000
+
+    Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+        suffix rule (reported by Matthieu Herrb)
+
+commit 00b3817d8c24dd400ff870bb02bc1c6ba2db1f05
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 01:12:07 2005 +0000
+
+    Add shadow man pages for atobm and bmtoa.
+
+commit ba5f0c8d40af187191bcda8c8e72b3e554f3c50a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:41 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 358ae071207882e6202bfaa4c0dd341f7239c307
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Oct 4 23:15:11 2005 +0000
+
+    Add bitmap.icon to EXTRA_DIST
+
+commit c3f282e1aa6176896089ea79be84b7250888a65c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Sep 29 18:22:01 2005 +0000
+
+    Add Bitmap-nocase app default file to APPDEFAULTFILES.
+
+commit 53c51b2407108d9bcdca53c4d3757449465b3417
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:27 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit 5135ddd5eb135237ea780d7e8c4a4074557ac23c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:28 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit 6df7e0644c9f0ce2f306331910d8adf903610c1a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Jul 26 15:44:01 2005 +0000
+
+    Replace more GNU make-ism's with more portable macros
+
+commit 55c2178d52dd695a31676bb7b48c1d19b3c77152
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 22:07:12 2005 +0000
+
+    Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get
+        HAS_MKSTEMP defined in modular builds.
+
+commit 40fc1a66cc817dad40851d61011e0a90fa48fe46
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 22:00:11 2005 +0000
+
+    Convert more app-defaults rules to work with non-GNU make
+
+commit 1bef5390ae91148e61c613235e7db3729d7e8781
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 21:59:14 2005 +0000
+
+    Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection
+        against tempfile race conditions in many places)
+
+commit cc48a5df41c59071eab0f58818366e10cb1ff4ac
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Fri Jul 15 16:52:07 2005 +0000
+
+    Add dependency on xbitmaps
+
+commit c6129c090ad25cd2f8b191f503ac6e8cd452a31d
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jul 6 15:47:38 2005 +0000
+
+    Build system for bitmap
+
+commit 9b6257bdb5461131e42a3d81330c76d7a2bc670a
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:31 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 5285b60deac481a96007a45bad4da61e8ead2552
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:34:49 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 9f0d53b85896e1c67f770b45edc0dfa5373110c0
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:12:50 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 632e06aaad484b25e1c1931a8eb579679372d416
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:15 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit c83dc161b34afe817ed47abacbf5bad132c73888
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:53 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit a9a10f80d2b5d444c38eb54e99a6bccb07e0cbd6
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:01 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 5b64274abaf585d108e65cb1dae497e74cad856e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:57 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 0bd1f9d8ccaf46397745779f5964f3b843186896
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:57 2003 +0000
+
+    Initial revision
+
+commit 9711ac0a780f686806c135045d2db9b99fbe923f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:52 2003 +0000
+
+    R6.6 is the Xorg base-line
--- a/bitmap/Makefile.am
+++ b/bitmap/Makefile.am
@ -78,8 +78,14 @@ SUFFIXES = .ad
 appdefault_DATA = $(APPDEFAULTFILES)


-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) bitmap.icon
+EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) bitmap.icon ChangeLog autogen.sh
 CLEANFILES = $(APPDEFAULTFILES)
+MAINTAINERCLEANFILES=ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog

 # bitmaps

--- a/bitmap/Makefile.in
+++ b/bitmap/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -35,6 +35,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.

+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -42,7 +43,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@ -56,7 +56,73 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+bin_PROGRAMS = bitmap$(EXEEXT) bmtoa$(EXEEXT) atobm$(EXEEXT)
+DIST_COMMON = README $(am__configure_deps) $(dist_bitmap_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
+	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
+	install-sh missing
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
+	"$(DESTDIR)$(appmandir)" "$(DESTDIR)$(bitmapdir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_atobm_OBJECTS = atobm-atobm.$(OBJEXT)
+atobm_OBJECTS = $(am_atobm_OBJECTS)
+atobm_DEPENDENCIES =
+am_bitmap_OBJECTS = bitmap-BitEdit.$(OBJEXT) bitmap-CutPaste.$(OBJEXT) \
+	bitmap-Graphics.$(OBJEXT) bitmap-ReqMach.$(OBJEXT) \
+	bitmap-Bitmap.$(OBJEXT) bitmap-Dialog.$(OBJEXT) \
+	bitmap-Handlers.$(OBJEXT)
+bitmap_OBJECTS = $(am_bitmap_OBJECTS)
+am__DEPENDENCIES_1 =
+bitmap_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_bmtoa_OBJECTS = bmtoa-bmtoa.$(OBJEXT)
+bmtoa_OBJECTS = $(am_bmtoa_OBJECTS)
+bmtoa_DEPENDENCIES = $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(atobm_SOURCES) $(bitmap_SOURCES) $(bmtoa_SOURCES)
+DIST_SOURCES = $(atobm_SOURCES) $(bitmap_SOURCES) $(bmtoa_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+appdefaultDATA_INSTALL = $(INSTALL_DATA)
+appmanDATA_INSTALL = $(INSTALL_DATA)
+dist_bitmapDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appdefault_DATA) $(appman_DATA) $(dist_bitmap_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@ -133,7 +199,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-
+am__tar = @am__tar@
+am__untar = @am__untar@

 # app default files

@ -164,6 +231,7 @@ libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@ -174,13 +242,9 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@

-bin_PROGRAMS = bitmap bmtoa atobm
-
-
 # bitmap
 bitmap_CFLAGS = $(BITMAP_CFLAGS)
 bitmap_LDADD = $(BITMAP_LIBS) -lm
-
 bitmap_SOURCES = \
         BitEdit.c \
         CutPaste.c \
@ -195,7 +259,6 @@ bitmap_SOURCES = \
         Requests.h


-
 # bmtoa
 bmtoa_CFLAGS = $(BMTOA_CFLAGS)
 bmtoa_LDADD = $(BMTOA_LIBS)
@ -203,7 +266,6 @@ bmtoa_SOURCES = \
         bmtoa.c


-
 # atobm
 atobm_CFLAGS = $(ATOBM_CFLAGS)
 atobm_LDADD = $(ATOBM_LDADD)
@ -211,29 +273,24 @@ atobm_SOURCES = \
         atobm.c


-
 # mans
 appman_PRE = \
             bitmap.man

-
 APPDEFAULTFILES = \
 	Bitmap-color \
 	Bitmap-nocase \
 	Bitmap

-
 SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
-
 appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) bitmap.icon $(appman_PRE)
+EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) bitmap.icon ChangeLog \
+	autogen.sh $(appman_PRE)
 CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA) $(BUILT_SOURCES)
-
+MAINTAINERCLEANFILES = ChangeLog

 # bitmaps
 bitmapdir = $(includedir)/X11/bitmaps
-
 dist_bitmap_DATA = \
 	Dashes		\
 	Down		\
@ -249,23 +306,17 @@ dist_bitmap_DATA = \
 	Term		\
 	Up

-
 APP_MAN_DIR_SUFFIX = $(APP_MAN_DIR:@mandir@/man%=%)
-
 appmandir = $(APP_MAN_DIR)
-
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) \
 	      $(man_shadows:=.@APP_MAN_SUFFIX@)

-
 BUILT_SOURCES = shadows.DONE
-
 SED = sed

 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
 XORGMANNAME = X Version 11
-
 MAN_SUBSTS = \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@ -279,78 +330,44 @@ MAN_SUBSTS = \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'

-
 man_shadows = atobm bmtoa
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = bitmap$(EXEEXT) bmtoa$(EXEEXT) atobm$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_atobm_OBJECTS = atobm-atobm.$(OBJEXT)
-atobm_OBJECTS = $(am_atobm_OBJECTS)
-atobm_DEPENDENCIES =
-atobm_LDFLAGS =
-am_bitmap_OBJECTS = bitmap-BitEdit.$(OBJEXT) bitmap-CutPaste.$(OBJEXT) \
-	bitmap-Graphics.$(OBJEXT) bitmap-ReqMach.$(OBJEXT) \
-	bitmap-Bitmap.$(OBJEXT) bitmap-Dialog.$(OBJEXT) \
-	bitmap-Handlers.$(OBJEXT)
-bitmap_OBJECTS = $(am_bitmap_OBJECTS)
-bitmap_DEPENDENCIES =
-bitmap_LDFLAGS =
-am_bmtoa_OBJECTS = bmtoa-bmtoa.$(OBJEXT)
-bmtoa_OBJECTS = $(am_bmtoa_OBJECTS)
-bmtoa_DEPENDENCIES =
-bmtoa_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atobm-atobm.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-BitEdit.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-Bitmap.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-CutPaste.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-Dialog.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-Graphics.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-Handlers.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bitmap-ReqMach.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bmtoa-bmtoa.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(atobm_SOURCES) $(bitmap_SOURCES) $(bmtoa_SOURCES)
-DATA = $(appdefault_DATA) $(appman_DATA) $(dist_bitmap_DATA)
-
-DIST_COMMON = README $(dist_bitmap_DATA) $(srcdir)/Makefile.in \
-	$(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
-	Makefile.am NEWS aclocal.m4 compile config.guess config.h.in \
-	config.sub configure configure.ac depcomp install-sh missing \
-	mkinstalldirs
-SOURCES = $(atobm_SOURCES) $(bitmap_SOURCES) $(bmtoa_SOURCES)
-
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am

 .SUFFIXES:
 .SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;

-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)

-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac 
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

 config.h: stamp-h1
@ -362,24 +379,23 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
+	rm -f stamp-h1
+	touch $@

 distclean-hdr:
 	-rm -f config.h stamp-h1
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done

@ -387,8 +403,8 @@ uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done

 clean-binPROGRAMS:
@ -404,7 +420,7 @@ bmtoa$(EXEEXT): $(bmtoa_OBJECTS) $(bmtoa_DEPENDENCIES)
 	$(LINK) $(bmtoa_LDFLAGS) $(bmtoa_OBJECTS) $(bmtoa_LDADD) $(LIBS)

 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)

 distclean-compile:
 	-rm -f *.tab.c
@ -420,288 +436,197 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmtoa-bmtoa.Po@am__quote@

 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<

 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`

 atobm-atobm.o: atobm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atobm_CFLAGS) $(CFLAGS) -MT atobm-atobm.o -MD -MP -MF "$(DEPDIR)/atobm-atobm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o atobm-atobm.o `test -f 'atobm.c' || echo '$(srcdir)/'`atobm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atobm-atobm.Tpo" "$(DEPDIR)/atobm-atobm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/atobm-atobm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atobm_CFLAGS) $(CFLAGS) -MT atobm-atobm.o -MD -MP -MF "$(DEPDIR)/atobm-atobm.Tpo" -c -o atobm-atobm.o `test -f 'atobm.c' || echo '$(srcdir)/'`atobm.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atobm-atobm.Tpo" "$(DEPDIR)/atobm-atobm.Po"; else rm -f "$(DEPDIR)/atobm-atobm.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atobm.c' object='atobm-atobm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atobm-atobm.Po' tmpdepfile='$(DEPDIR)/atobm-atobm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atobm_CFLAGS) $(CFLAGS) -c -o atobm-atobm.o `test -f 'atobm.c' || echo '$(srcdir)/'`atobm.c

 atobm-atobm.obj: atobm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atobm_CFLAGS) $(CFLAGS) -MT atobm-atobm.obj -MD -MP -MF "$(DEPDIR)/atobm-atobm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o atobm-atobm.obj `if test -f 'atobm.c'; then $(CYGPATH_W) 'atobm.c'; else $(CYGPATH_W) '$(srcdir)/atobm.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atobm-atobm.Tpo" "$(DEPDIR)/atobm-atobm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/atobm-atobm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atobm_CFLAGS) $(CFLAGS) -MT atobm-atobm.obj -MD -MP -MF "$(DEPDIR)/atobm-atobm.Tpo" -c -o atobm-atobm.obj `if test -f 'atobm.c'; then $(CYGPATH_W) 'atobm.c'; else $(CYGPATH_W) '$(srcdir)/atobm.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atobm-atobm.Tpo" "$(DEPDIR)/atobm-atobm.Po"; else rm -f "$(DEPDIR)/atobm-atobm.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atobm.c' object='atobm-atobm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atobm-atobm.Po' tmpdepfile='$(DEPDIR)/atobm-atobm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atobm_CFLAGS) $(CFLAGS) -c -o atobm-atobm.obj `if test -f 'atobm.c'; then $(CYGPATH_W) 'atobm.c'; else $(CYGPATH_W) '$(srcdir)/atobm.c'; fi`

 bitmap-BitEdit.o: BitEdit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-BitEdit.o -MD -MP -MF "$(DEPDIR)/bitmap-BitEdit.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-BitEdit.o `test -f 'BitEdit.c' || echo '$(srcdir)/'`BitEdit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-BitEdit.Tpo" "$(DEPDIR)/bitmap-BitEdit.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-BitEdit.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-BitEdit.o -MD -MP -MF "$(DEPDIR)/bitmap-BitEdit.Tpo" -c -o bitmap-BitEdit.o `test -f 'BitEdit.c' || echo '$(srcdir)/'`BitEdit.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-BitEdit.Tpo" "$(DEPDIR)/bitmap-BitEdit.Po"; else rm -f "$(DEPDIR)/bitmap-BitEdit.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='BitEdit.c' object='bitmap-BitEdit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-BitEdit.Po' tmpdepfile='$(DEPDIR)/bitmap-BitEdit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-BitEdit.o `test -f 'BitEdit.c' || echo '$(srcdir)/'`BitEdit.c

 bitmap-BitEdit.obj: BitEdit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-BitEdit.obj -MD -MP -MF "$(DEPDIR)/bitmap-BitEdit.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-BitEdit.obj `if test -f 'BitEdit.c'; then $(CYGPATH_W) 'BitEdit.c'; else $(CYGPATH_W) '$(srcdir)/BitEdit.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-BitEdit.Tpo" "$(DEPDIR)/bitmap-BitEdit.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-BitEdit.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-BitEdit.obj -MD -MP -MF "$(DEPDIR)/bitmap-BitEdit.Tpo" -c -o bitmap-BitEdit.obj `if test -f 'BitEdit.c'; then $(CYGPATH_W) 'BitEdit.c'; else $(CYGPATH_W) '$(srcdir)/BitEdit.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-BitEdit.Tpo" "$(DEPDIR)/bitmap-BitEdit.Po"; else rm -f "$(DEPDIR)/bitmap-BitEdit.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='BitEdit.c' object='bitmap-BitEdit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-BitEdit.Po' tmpdepfile='$(DEPDIR)/bitmap-BitEdit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-BitEdit.obj `if test -f 'BitEdit.c'; then $(CYGPATH_W) 'BitEdit.c'; else $(CYGPATH_W) '$(srcdir)/BitEdit.c'; fi`

 bitmap-CutPaste.o: CutPaste.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-CutPaste.o -MD -MP -MF "$(DEPDIR)/bitmap-CutPaste.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-CutPaste.o `test -f 'CutPaste.c' || echo '$(srcdir)/'`CutPaste.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-CutPaste.Tpo" "$(DEPDIR)/bitmap-CutPaste.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-CutPaste.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-CutPaste.o -MD -MP -MF "$(DEPDIR)/bitmap-CutPaste.Tpo" -c -o bitmap-CutPaste.o `test -f 'CutPaste.c' || echo '$(srcdir)/'`CutPaste.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-CutPaste.Tpo" "$(DEPDIR)/bitmap-CutPaste.Po"; else rm -f "$(DEPDIR)/bitmap-CutPaste.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='CutPaste.c' object='bitmap-CutPaste.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-CutPaste.Po' tmpdepfile='$(DEPDIR)/bitmap-CutPaste.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-CutPaste.o `test -f 'CutPaste.c' || echo '$(srcdir)/'`CutPaste.c

 bitmap-CutPaste.obj: CutPaste.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-CutPaste.obj -MD -MP -MF "$(DEPDIR)/bitmap-CutPaste.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-CutPaste.obj `if test -f 'CutPaste.c'; then $(CYGPATH_W) 'CutPaste.c'; else $(CYGPATH_W) '$(srcdir)/CutPaste.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-CutPaste.Tpo" "$(DEPDIR)/bitmap-CutPaste.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-CutPaste.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-CutPaste.obj -MD -MP -MF "$(DEPDIR)/bitmap-CutPaste.Tpo" -c -o bitmap-CutPaste.obj `if test -f 'CutPaste.c'; then $(CYGPATH_W) 'CutPaste.c'; else $(CYGPATH_W) '$(srcdir)/CutPaste.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-CutPaste.Tpo" "$(DEPDIR)/bitmap-CutPaste.Po"; else rm -f "$(DEPDIR)/bitmap-CutPaste.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='CutPaste.c' object='bitmap-CutPaste.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-CutPaste.Po' tmpdepfile='$(DEPDIR)/bitmap-CutPaste.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-CutPaste.obj `if test -f 'CutPaste.c'; then $(CYGPATH_W) 'CutPaste.c'; else $(CYGPATH_W) '$(srcdir)/CutPaste.c'; fi`

 bitmap-Graphics.o: Graphics.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Graphics.o -MD -MP -MF "$(DEPDIR)/bitmap-Graphics.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Graphics.o `test -f 'Graphics.c' || echo '$(srcdir)/'`Graphics.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Graphics.Tpo" "$(DEPDIR)/bitmap-Graphics.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Graphics.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Graphics.o -MD -MP -MF "$(DEPDIR)/bitmap-Graphics.Tpo" -c -o bitmap-Graphics.o `test -f 'Graphics.c' || echo '$(srcdir)/'`Graphics.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Graphics.Tpo" "$(DEPDIR)/bitmap-Graphics.Po"; else rm -f "$(DEPDIR)/bitmap-Graphics.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Graphics.c' object='bitmap-Graphics.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Graphics.Po' tmpdepfile='$(DEPDIR)/bitmap-Graphics.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Graphics.o `test -f 'Graphics.c' || echo '$(srcdir)/'`Graphics.c

 bitmap-Graphics.obj: Graphics.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Graphics.obj -MD -MP -MF "$(DEPDIR)/bitmap-Graphics.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Graphics.obj `if test -f 'Graphics.c'; then $(CYGPATH_W) 'Graphics.c'; else $(CYGPATH_W) '$(srcdir)/Graphics.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Graphics.Tpo" "$(DEPDIR)/bitmap-Graphics.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Graphics.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Graphics.obj -MD -MP -MF "$(DEPDIR)/bitmap-Graphics.Tpo" -c -o bitmap-Graphics.obj `if test -f 'Graphics.c'; then $(CYGPATH_W) 'Graphics.c'; else $(CYGPATH_W) '$(srcdir)/Graphics.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Graphics.Tpo" "$(DEPDIR)/bitmap-Graphics.Po"; else rm -f "$(DEPDIR)/bitmap-Graphics.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Graphics.c' object='bitmap-Graphics.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Graphics.Po' tmpdepfile='$(DEPDIR)/bitmap-Graphics.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Graphics.obj `if test -f 'Graphics.c'; then $(CYGPATH_W) 'Graphics.c'; else $(CYGPATH_W) '$(srcdir)/Graphics.c'; fi`

 bitmap-ReqMach.o: ReqMach.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-ReqMach.o -MD -MP -MF "$(DEPDIR)/bitmap-ReqMach.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-ReqMach.o `test -f 'ReqMach.c' || echo '$(srcdir)/'`ReqMach.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-ReqMach.Tpo" "$(DEPDIR)/bitmap-ReqMach.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-ReqMach.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-ReqMach.o -MD -MP -MF "$(DEPDIR)/bitmap-ReqMach.Tpo" -c -o bitmap-ReqMach.o `test -f 'ReqMach.c' || echo '$(srcdir)/'`ReqMach.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-ReqMach.Tpo" "$(DEPDIR)/bitmap-ReqMach.Po"; else rm -f "$(DEPDIR)/bitmap-ReqMach.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ReqMach.c' object='bitmap-ReqMach.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-ReqMach.Po' tmpdepfile='$(DEPDIR)/bitmap-ReqMach.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-ReqMach.o `test -f 'ReqMach.c' || echo '$(srcdir)/'`ReqMach.c

 bitmap-ReqMach.obj: ReqMach.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-ReqMach.obj -MD -MP -MF "$(DEPDIR)/bitmap-ReqMach.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-ReqMach.obj `if test -f 'ReqMach.c'; then $(CYGPATH_W) 'ReqMach.c'; else $(CYGPATH_W) '$(srcdir)/ReqMach.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-ReqMach.Tpo" "$(DEPDIR)/bitmap-ReqMach.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-ReqMach.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-ReqMach.obj -MD -MP -MF "$(DEPDIR)/bitmap-ReqMach.Tpo" -c -o bitmap-ReqMach.obj `if test -f 'ReqMach.c'; then $(CYGPATH_W) 'ReqMach.c'; else $(CYGPATH_W) '$(srcdir)/ReqMach.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-ReqMach.Tpo" "$(DEPDIR)/bitmap-ReqMach.Po"; else rm -f "$(DEPDIR)/bitmap-ReqMach.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ReqMach.c' object='bitmap-ReqMach.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-ReqMach.Po' tmpdepfile='$(DEPDIR)/bitmap-ReqMach.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-ReqMach.obj `if test -f 'ReqMach.c'; then $(CYGPATH_W) 'ReqMach.c'; else $(CYGPATH_W) '$(srcdir)/ReqMach.c'; fi`

 bitmap-Bitmap.o: Bitmap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Bitmap.o -MD -MP -MF "$(DEPDIR)/bitmap-Bitmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Bitmap.o `test -f 'Bitmap.c' || echo '$(srcdir)/'`Bitmap.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Bitmap.Tpo" "$(DEPDIR)/bitmap-Bitmap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Bitmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Bitmap.o -MD -MP -MF "$(DEPDIR)/bitmap-Bitmap.Tpo" -c -o bitmap-Bitmap.o `test -f 'Bitmap.c' || echo '$(srcdir)/'`Bitmap.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Bitmap.Tpo" "$(DEPDIR)/bitmap-Bitmap.Po"; else rm -f "$(DEPDIR)/bitmap-Bitmap.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Bitmap.c' object='bitmap-Bitmap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Bitmap.Po' tmpdepfile='$(DEPDIR)/bitmap-Bitmap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Bitmap.o `test -f 'Bitmap.c' || echo '$(srcdir)/'`Bitmap.c

 bitmap-Bitmap.obj: Bitmap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Bitmap.obj -MD -MP -MF "$(DEPDIR)/bitmap-Bitmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Bitmap.obj `if test -f 'Bitmap.c'; then $(CYGPATH_W) 'Bitmap.c'; else $(CYGPATH_W) '$(srcdir)/Bitmap.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Bitmap.Tpo" "$(DEPDIR)/bitmap-Bitmap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Bitmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Bitmap.obj -MD -MP -MF "$(DEPDIR)/bitmap-Bitmap.Tpo" -c -o bitmap-Bitmap.obj `if test -f 'Bitmap.c'; then $(CYGPATH_W) 'Bitmap.c'; else $(CYGPATH_W) '$(srcdir)/Bitmap.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Bitmap.Tpo" "$(DEPDIR)/bitmap-Bitmap.Po"; else rm -f "$(DEPDIR)/bitmap-Bitmap.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Bitmap.c' object='bitmap-Bitmap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Bitmap.Po' tmpdepfile='$(DEPDIR)/bitmap-Bitmap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Bitmap.obj `if test -f 'Bitmap.c'; then $(CYGPATH_W) 'Bitmap.c'; else $(CYGPATH_W) '$(srcdir)/Bitmap.c'; fi`

 bitmap-Dialog.o: Dialog.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Dialog.o -MD -MP -MF "$(DEPDIR)/bitmap-Dialog.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Dialog.o `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Dialog.Tpo" "$(DEPDIR)/bitmap-Dialog.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Dialog.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Dialog.o -MD -MP -MF "$(DEPDIR)/bitmap-Dialog.Tpo" -c -o bitmap-Dialog.o `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Dialog.Tpo" "$(DEPDIR)/bitmap-Dialog.Po"; else rm -f "$(DEPDIR)/bitmap-Dialog.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Dialog.c' object='bitmap-Dialog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Dialog.Po' tmpdepfile='$(DEPDIR)/bitmap-Dialog.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Dialog.o `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c

 bitmap-Dialog.obj: Dialog.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Dialog.obj -MD -MP -MF "$(DEPDIR)/bitmap-Dialog.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Dialog.obj `if test -f 'Dialog.c'; then $(CYGPATH_W) 'Dialog.c'; else $(CYGPATH_W) '$(srcdir)/Dialog.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Dialog.Tpo" "$(DEPDIR)/bitmap-Dialog.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Dialog.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Dialog.obj -MD -MP -MF "$(DEPDIR)/bitmap-Dialog.Tpo" -c -o bitmap-Dialog.obj `if test -f 'Dialog.c'; then $(CYGPATH_W) 'Dialog.c'; else $(CYGPATH_W) '$(srcdir)/Dialog.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Dialog.Tpo" "$(DEPDIR)/bitmap-Dialog.Po"; else rm -f "$(DEPDIR)/bitmap-Dialog.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Dialog.c' object='bitmap-Dialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Dialog.Po' tmpdepfile='$(DEPDIR)/bitmap-Dialog.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Dialog.obj `if test -f 'Dialog.c'; then $(CYGPATH_W) 'Dialog.c'; else $(CYGPATH_W) '$(srcdir)/Dialog.c'; fi`

 bitmap-Handlers.o: Handlers.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Handlers.o -MD -MP -MF "$(DEPDIR)/bitmap-Handlers.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Handlers.o `test -f 'Handlers.c' || echo '$(srcdir)/'`Handlers.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Handlers.Tpo" "$(DEPDIR)/bitmap-Handlers.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Handlers.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Handlers.o -MD -MP -MF "$(DEPDIR)/bitmap-Handlers.Tpo" -c -o bitmap-Handlers.o `test -f 'Handlers.c' || echo '$(srcdir)/'`Handlers.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Handlers.Tpo" "$(DEPDIR)/bitmap-Handlers.Po"; else rm -f "$(DEPDIR)/bitmap-Handlers.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Handlers.c' object='bitmap-Handlers.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Handlers.Po' tmpdepfile='$(DEPDIR)/bitmap-Handlers.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Handlers.o `test -f 'Handlers.c' || echo '$(srcdir)/'`Handlers.c

 bitmap-Handlers.obj: Handlers.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Handlers.obj -MD -MP -MF "$(DEPDIR)/bitmap-Handlers.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bitmap-Handlers.obj `if test -f 'Handlers.c'; then $(CYGPATH_W) 'Handlers.c'; else $(CYGPATH_W) '$(srcdir)/Handlers.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Handlers.Tpo" "$(DEPDIR)/bitmap-Handlers.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bitmap-Handlers.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -MT bitmap-Handlers.obj -MD -MP -MF "$(DEPDIR)/bitmap-Handlers.Tpo" -c -o bitmap-Handlers.obj `if test -f 'Handlers.c'; then $(CYGPATH_W) 'Handlers.c'; else $(CYGPATH_W) '$(srcdir)/Handlers.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bitmap-Handlers.Tpo" "$(DEPDIR)/bitmap-Handlers.Po"; else rm -f "$(DEPDIR)/bitmap-Handlers.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Handlers.c' object='bitmap-Handlers.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bitmap-Handlers.Po' tmpdepfile='$(DEPDIR)/bitmap-Handlers.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitmap_CFLAGS) $(CFLAGS) -c -o bitmap-Handlers.obj `if test -f 'Handlers.c'; then $(CYGPATH_W) 'Handlers.c'; else $(CYGPATH_W) '$(srcdir)/Handlers.c'; fi`

 bmtoa-bmtoa.o: bmtoa.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bmtoa_CFLAGS) $(CFLAGS) -MT bmtoa-bmtoa.o -MD -MP -MF "$(DEPDIR)/bmtoa-bmtoa.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bmtoa-bmtoa.o `test -f 'bmtoa.c' || echo '$(srcdir)/'`bmtoa.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bmtoa-bmtoa.Tpo" "$(DEPDIR)/bmtoa-bmtoa.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bmtoa-bmtoa.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bmtoa_CFLAGS) $(CFLAGS) -MT bmtoa-bmtoa.o -MD -MP -MF "$(DEPDIR)/bmtoa-bmtoa.Tpo" -c -o bmtoa-bmtoa.o `test -f 'bmtoa.c' || echo '$(srcdir)/'`bmtoa.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bmtoa-bmtoa.Tpo" "$(DEPDIR)/bmtoa-bmtoa.Po"; else rm -f "$(DEPDIR)/bmtoa-bmtoa.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bmtoa.c' object='bmtoa-bmtoa.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bmtoa-bmtoa.Po' tmpdepfile='$(DEPDIR)/bmtoa-bmtoa.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bmtoa_CFLAGS) $(CFLAGS) -c -o bmtoa-bmtoa.o `test -f 'bmtoa.c' || echo '$(srcdir)/'`bmtoa.c

 bmtoa-bmtoa.obj: bmtoa.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bmtoa_CFLAGS) $(CFLAGS) -MT bmtoa-bmtoa.obj -MD -MP -MF "$(DEPDIR)/bmtoa-bmtoa.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o bmtoa-bmtoa.obj `if test -f 'bmtoa.c'; then $(CYGPATH_W) 'bmtoa.c'; else $(CYGPATH_W) '$(srcdir)/bmtoa.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bmtoa-bmtoa.Tpo" "$(DEPDIR)/bmtoa-bmtoa.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/bmtoa-bmtoa.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bmtoa_CFLAGS) $(CFLAGS) -MT bmtoa-bmtoa.obj -MD -MP -MF "$(DEPDIR)/bmtoa-bmtoa.Tpo" -c -o bmtoa-bmtoa.obj `if test -f 'bmtoa.c'; then $(CYGPATH_W) 'bmtoa.c'; else $(CYGPATH_W) '$(srcdir)/bmtoa.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bmtoa-bmtoa.Tpo" "$(DEPDIR)/bmtoa-bmtoa.Po"; else rm -f "$(DEPDIR)/bmtoa-bmtoa.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bmtoa.c' object='bmtoa-bmtoa.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/bmtoa-bmtoa.Po' tmpdepfile='$(DEPDIR)/bmtoa-bmtoa.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bmtoa_CFLAGS) $(CFLAGS) -c -o bmtoa-bmtoa.obj `if test -f 'bmtoa.c'; then $(CYGPATH_W) 'bmtoa.c'; else $(CYGPATH_W) '$(srcdir)/bmtoa.c'; fi`
 uninstall-info-am:
-appdefaultDATA_INSTALL = $(INSTALL_DATA)
 install-appdefaultDATA: $(appdefault_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(appdefaultdir)
+	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
 	@list='$(appdefault_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(appdefaultDATA_INSTALL) $$d$$p $(DESTDIR)$(appdefaultdir)/$$f"; \
-	  $(appdefaultDATA_INSTALL) $$d$$p $(DESTDIR)$(appdefaultdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+	  $(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
 	done

 uninstall-appdefaultDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(appdefault_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(appdefaultdir)/$$f"; \
-	  rm -f $(DESTDIR)$(appdefaultdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
 	done
-appmanDATA_INSTALL = $(INSTALL_DATA)
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(appmandir)
+	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
 	@list='$(appman_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(appmanDATA_INSTALL) $$d$$p $(DESTDIR)$(appmandir)/$$f"; \
-	  $(appmanDATA_INSTALL) $$d$$p $(DESTDIR)$(appmandir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
+	  $(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
 	done

 uninstall-appmanDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(appman_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(appmandir)/$$f"; \
-	  rm -f $(DESTDIR)$(appmandir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appmandir)/$$f"; \
 	done
-dist_bitmapDATA_INSTALL = $(INSTALL_DATA)
 install-dist_bitmapDATA: $(dist_bitmap_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bitmapdir)
+	test -z "$(bitmapdir)" || $(mkdir_p) "$(DESTDIR)$(bitmapdir)"
 	@list='$(dist_bitmap_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(dist_bitmapDATA_INSTALL) $$d$$p $(DESTDIR)$(bitmapdir)/$$f"; \
-	  $(dist_bitmapDATA_INSTALL) $$d$$p $(DESTDIR)$(bitmapdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_bitmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(bitmapdir)/$$f'"; \
+	  $(dist_bitmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(bitmapdir)/$$f"; \
 	done

 uninstall-dist_bitmapDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_bitmap_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(bitmapdir)/$$f"; \
-	  rm -f $(DESTDIR)$(bitmapdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(bitmapdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bitmapdir)/$$f"; \
 	done

-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@ -710,6 +635,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS

 TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -721,10 +647,11 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -747,19 +674,6 @@ GTAGS:

 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print

 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@ -775,7 +689,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@ -790,30 +704,55 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)

-dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)

 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)

 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
@ -833,19 +772,20 @@ distcheck: dist
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@ -868,9 +808,10 @@ check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(appdefaultdir) $(DESTDIR)$(appmandir) $(DESTDIR)$(bitmapdir)
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(bitmapdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
@ -892,12 +833,13 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am

 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -906,13 +848,15 @@ distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
-	distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-tags

 dvi: dvi-am

 dvi-am:

+html: html-am
+
 info: info-am

 info-am:
@ -951,11 +895,12 @@ uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
 	uninstall-binPROGRAMS uninstall-dist_bitmapDATA \
 	uninstall-info-am

-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
-	distcheck distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am info info-am install install-am \
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
+	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
 	install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
 	install-data install-data-am install-dist_bitmapDATA \
 	install-exec install-exec-am install-info install-info-am \
@ -970,6 +915,11 @@ uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
 .ad:
 	cp $< $@

+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@

--- a/bitmap/aclocal.m4
+++ b/bitmap/aclocal.m4
--- a/bitmap/autogen.sh
+++ b/bitmap/autogen.sh
@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
--- a/bitmap/bitmap.man
+++ b/bitmap/bitmap.man
@ -88,23 +88,18 @@ Grid tolerance.  If the square dimensions fall below the specified
 value, grid will be automatically turned off.
 .TP 4
 .B \-grid, +grid
-./&.B \-grid\fI on/off\fP
 Turns on or off the grid lines.
 .TP 4
 .B \-axes, +axes
-./&./&.B \-axes\fI on/off\fP
 Turns on or off the major axes.
 .TP 4
 .B \-dashed, +dashed
-./&.B \-dashed\fI on/off\fP
 Turns on or off dashing for the frame and grid lines.
 .TP 4
-.B \-stippled, +stippled 
-./&.B \-stippled\fI on/off\fP
+.B \-stippled, +stippled
 Turns on or off stippling of highlighted squares.
 .TP 4
-.B \-proportional, +proportional\fI 
-./&.B \-proportional\fI on/off\fP
+.B \-proportional, +proportional
 Turns proportional mode on or off.  If proportional mode is on, 
 square width is equal to square height.  If proportional mode is
 off,\fI bitmap\fP will use the smaller square dimension, if they 
--- a/bitmap/bmtoa.c
+++ b/bitmap/bmtoa.c
@ -1,5 +1,5 @@
 /* $Xorg: bmtoa.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */
-/* $XdotOrg: app/bitmap/bmtoa.c,v 1.3 2005/07/16 22:07:12 alanc Exp $ */
+/* $XdotOrg: $ */
 /*

 Copyright 1988, 1993, 1998  The Open Group
--- a/bitmap/config.guess
+++ b/bitmap/config.guess
@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.

-timestamp='2005-07-08'
+timestamp='2006-12-08'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -106,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@ -206,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
    *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@ -764,7 +769,14 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@ -779,8 +791,11 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@ -794,7 +809,7 @@ EOF
    i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
    p*:CYGWIN*:*)
@ -817,6 +832,9 @@ EOF
    arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
    cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@ -851,7 +869,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    mips64:Linux:*:*)
@ -870,9 +892,16 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@ -916,9 +945,15 @@ EOF
    sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
    x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@ -961,7 +996,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@ -971,7 +1006,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@ -1173,6 +1212,12 @@ EOF
    SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@ -1182,7 +1227,6 @@ EOF
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@ -1261,6 +1305,9 @@ EOF
    i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/bitmap/config.h.in
+++ b/bitmap/config.h.in
@ -21,5 +21,14 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
 /* Version number of package */
 #undef VERSION
--- a/bitmap/config.sub
+++ b/bitmap/config.sub
@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.

-timestamp='2005-07-08'
+timestamp='2006-12-08'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -119,8 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@ -171,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -187,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -231,15 +241,16 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@ -257,28 +268,27 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@ -286,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@ -305,18 +318,18 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@ -336,31 +349,30 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@ -696,6 +708,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@ -803,6 +818,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@ -859,6 +880,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@ -885,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@ -896,6 +925,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@ -1101,7 +1133,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@ -1174,21 +1206,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1340,6 +1374,12 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@ -1349,9 +1389,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
--- a/bitmap/configure
+++ b/bitmap/configure
--- a/bitmap/configure.ac
+++ b/bitmap/configure.ac
@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.

 AC_PREREQ([2.57])
-AC_INIT(bitmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],bitmap)
+AC_INIT(bitmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],bitmap)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE

--- a/bitmap/mkinstalldirs
+++ b/bitmap/mkinstalldirs
@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
--- a/debian/changelog
+++ b/debian/changelog
@ -4,8 +4,9 @@ xbase-clients (1:7.2.ds1-1) UNRELEASED; urgency=low
    to Celejar <celejar@gmail.com> for noticing.
  * Update to appres 1.0.1.
  * Update to beforelight 1.0.2.
+  * Update to bitmap 1.0.3.

- -- Julien Cristau <jcristau@debian.org>  Sun, 11 Feb 2007 07:01:36 +0100
+ -- Julien Cristau <jcristau@debian.org>  Sun, 11 Feb 2007 07:05:05 +0100

 xbase-clients (1:7.1.ds1-2) unstable; urgency=low