x11-apps: Changes to 'debian-experimental'
debian/changelog | 4
xmag/ChangeLog | 280 ++++++++-
xmag/INSTALL | 236 --------
xmag/Makefile.am | 12
xmag/Makefile.in | 199 ++----
xmag/aclocal.m4 | 1548 ++++++++++++++++++++++++++---------------------------
xmag/compile | 142 ----
xmag/config.h.in | 18
xmag/config.sub | 14
xmag/configure | 383 +++++++------
xmag/configure.ac | 4
xmag/depcomp | 64 ++
xmag/install-sh | 348 +++++++++--
xmag/missing | 61 +-
xmag/mkinstalldirs | 158 -----
xmag/xmag.c | 36 +
xmag/xmag.man | 2
17 files changed, 1784 insertions(+), 1725 deletions(-)
New commits:
commit 6428a0d67e48a3e008d789575c6d271b24978f6f
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 17 00:17:06 2007 +0200
xmag 1.0.2.
diff --git a/debian/changelog b/debian/changelog
index 8880257..546a27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,15 @@ x11-apps (7.2+1) UNRELEASED; urgency=low
* xclock 1.0.3.
+ adds documentation for the -face command-line option (closes: #224402)
* xman 1.0.3.
+ * xmag 1.0.2.
+ + manpage fixed (closes: #180712).
* Pass --with-sysmanpath option to configure so xman looks for manpages in
the right place (closes: #156497).
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
- -- Julien Cristau <jcristau@debian.org> Wed, 15 Aug 2007 13:49:27 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 17 Aug 2007 00:12:12 +0200
x11-apps (0.1) experimental; urgency=low
diff --git a/xmag/ChangeLog b/xmag/ChangeLog
index aabcd28..206be17 100644
--- a/xmag/ChangeLog
+++ b/xmag/ChangeLog
@@ -1,34 +1,272 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a6b0036a082a947b89bdbb27128e20079799857c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Aug 15 18:04:12 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e4cd84139d155bf0ce7b42de65e2a5bfcc471a46
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Aug 15 17:59:30 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Change xmag_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `CutPaste.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d990122dafcde5d22c8f1aa40e8f9dc213f79e17
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Aug 1 13:22:35 2007 -0700
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ Make fix for Sun bug 6359959 more portable - use nanosleep, poll or select
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit eb12c1f539cebbd7481711d1dc97e3e29b594389
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Dec 13 00:00:00 2005 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Sun bug 6359959: xmag overconsumes CPU due to its selection box
+
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6359959>
+
+ The fix for Sun bug 1166559 changed the HLINTERVAL from 10 to 0.5 to fix
+ a problem that the selection box wasn't being seen. The problem is that
+ this parameter is used in an XtAppAddTimeOut(), and is supposed to be an
+ unsigned long. Thus, the 0.5 presumably turns into a 0 ms timeout. Whatever
+ effect that is being seen is due to seeing a rectangle drawn as fast as
+ the poor little X server can do it.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a04689bccae3bd2df3812a8ed7fc0d675fdb05e9
+Author: Derek Wang <derek.wang@sun.com>
+Date: Mon May 8 00:00:00 2000 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Sun bug 1166559: highlight of selection box not discernable on some configs
+
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=1166559>
+
+ 1) On devices whose default visual is 24-bit TrueColor the selection area
+ bounding box has no contrast with the background. This is because a
+ value of 1 is being xor'd in. This won't provide enough contrast. A
+ value of 0xffffff would be better.
+
+ 2) On my machine (which is a dual 50-Mhz SS10) you can sort of see the
+ bounding box on my GX if you look really, really close, but it's a faint
+ flicker. I believe what is happening is that the bounding box is being
+ drawn and undrawn so fast you can hardly see it.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 80faa0025128c10662694e818747fd0a592bc108
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jun 1 16:40:07 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bff2deea15bd0b676458b88acb46d63fd72b86af
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat May 19 00:06:28 2007 -0700
- * Makefile.am: Add xmag.icon to EXTRA_DIST
+ X.Org Bug #10616: xmag man page says "Cut" button instead of "Select"
+
+ X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
+ Reported upstream from
+ Debian bug #180712 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=180712>
+
+commit f137f0414022575553bd65c3179b694be391c428
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat May 19 00:01:58 2007 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 5ef80b96a9d8676f79c5e27c727789d63a61e45b
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:52 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 0a9729f6c8a8e644e4048ee5135a35d9f0603e56
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:45 2005 +0000
+
+ Stub COPYING files
+
+commit 094ca9cfcd3c6910a3e6981afdea8c461b636271
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:09 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 61019bb2e2eea3f970540dc24d1bd52d508e5f60
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 7 16:18:00 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 95ba475220dafec7777d5e3802d817fb068a70ed
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:24 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 9223bc8f2d024f4dd378454ec3ecf5da6d51874e
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:26 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 7ebdd01ac939fdbe290d14a6c80a7d4aaf555347
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:44 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 0fdfec2cbbd3ac47a2c67e5a6bf5594a300c92be
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:35:02 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 5dad105bfb499209c18e8716a38f1c4eb5e93d6d
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:54 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 75f0fc733252f111d0fc7de07622a46e4adc675a
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:55 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 0d383b0eb8c7177fa12f8138c7ad9e527a98ba59
+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 c15d91b39f14e916d17581b1b653e3057571399f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:24 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 3beed227e1ea75c57e38deba4a325303136947f4
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:46 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 3a983a36e2a566b96dc92ba061c7795207ff6e0c
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Oct 4 23:59:50 2005 +0000
+
+ Add xmag.icon to EXTRA_DIST
+
+commit bb2d194053c71d49aefbcce7cbc371924163d7ce
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Oct 2 20:20:12 2005 +0000
+
+ Add developer documentation of xmag's Scale widget class to app/xmag
+
+commit 400ba6d65004e8c5ccc2fe45195374e46be21fe4
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:30 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 312910577edf6841f797317a8fe521abb1987a1b
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:36 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 175a29fb026e628b815a443beb305514bf90f74e
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Jul 26 15:44:02 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit 2453fa155493771d1ce948de0122c3e53e0cd5d1
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Jul 23 16:43:02 2005 +0000
+
+ fix GNU-make only app-defaults rule
+
+commit 45e2eed46b415283bd56f2830d67117c7861cb3c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:32:02 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit 38ca5441b199b16b3d2dee2c2b8eaa133aec99a9
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 5 22:51:11 2005 +0000
+
+ Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,
+ xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable
+ xaw_use_xprint symlink.sh: add some extra files for xgc, xinit,
+ xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c:
+ Conditionalize use of xprint
+
+commit 0cac7e38453d2c9c670fb9f9100c244bf9f7b98e
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:58 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 6571a03e0f78ea6f45a4c67c60ba54b8980c3f76
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:39 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 4344e337c42eb72bcc24257ba5345a4d102c1849
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:13:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit ce152a72a5422ba9c6c7a4c0298f8da6cf0f0a50
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 8f63e90e414e756e3aeeb57014c75b2b0882f799
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:24:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 07819d0d328460410b940d05ee36235c255cf698
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c6d1f60f8f68135337e8d0c5a9d564d1b4932104
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4c688ea7bec8b76e643d610577104e5519722be9
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ Initial revision
+
+commit 31f434e2df14612e3cf18fe45a6c161eb3c225ff
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:54 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/xmag/INSTALL b/xmag/INSTALL
index 23e5f25..e69de29 100644
--- a/xmag/INSTALL
+++ b/xmag/INSTALL
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/xmag/Makefile.am b/xmag/Makefile.am
index b2a1bfd..83c4dad 100644
--- a/xmag/Makefile.am
+++ b/xmag/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xmag
-xmag_CFLAGS = $(XMAG_CFLAGS)
+AM_CFLAGS = $(XMAG_CFLAGS)
xmag_LDADD = $(XMAG_LIBS) -lm
xmag_SOURCES = \
@@ -92,3 +92,13 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: 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
diff --git a/xmag/Makefile.in b/xmag/Makefile.in
index 9f0d1d8..a8b555e 100644
--- a/xmag/Makefile.in
+++ b/xmag/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -36,15 +36,11 @@
# PERFORMANCE OF THIS SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
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
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -59,31 +55,30 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xmag$(EXEEXT)
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(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 \
- mkinstalldirs
-subdir = .
+ config.guess config.sub depcomp install-sh missing
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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
"$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_xmag_OBJECTS = xmag-CutPaste.$(OBJEXT) xmag-RootWin.$(OBJEXT) \
- xmag-Scale.$(OBJEXT) xmag-xmag.$(OBJEXT)
+am_xmag_OBJECTS = CutPaste.$(OBJEXT) RootWin.$(OBJEXT) Scale.$(OBJEXT) \
+ xmag.$(OBJEXT)
xmag_OBJECTS = $(am_xmag_OBJECTS)
am__DEPENDENCIES_1 =
xmag_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -117,8 +112,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
@@ -143,6 +136,7 @@ ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -154,11 +148,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -174,13 +167,13 @@ STRIP = @STRIP@
TMP_XAW_CFLAGS = @TMP_XAW_CFLAGS@
TMP_XAW_LIBS = @TMP_XAW_LIBS@
VERSION = @VERSION@
-XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
-XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
XMAG_CFLAGS = @XMAG_CFLAGS@
XMAG_LIBS = @XMAG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -195,6 +188,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -222,9 +216,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-xmag_CFLAGS = $(XMAG_CFLAGS)
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = $(XMAG_CFLAGS)
xmag_LDADD = $(XMAG_LIBS) -lm
xmag_SOURCES = \
CutPaste.c \
@@ -248,7 +245,7 @@ appdefault_DATA = $(APPDEFAULTFILES)
# Developer documentation for Scale widget in Scale.c
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Scale.txt xmag.icon \
- $(appman_PRE)
+ $(appman_PRE) ChangeLog
CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
@@ -270,6 +267,7 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -312,7 +310,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -327,7 +325,7 @@ distclean-hdr:
-rm -f config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(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 \
@@ -350,7 +348,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
xmag$(EXEEXT): $(xmag_OBJECTS) $(xmag_DEPENDENCIES)
@rm -f xmag$(EXEEXT)
- $(LINK) $(xmag_LDFLAGS) $(xmag_OBJECTS) $(xmag_LDADD) $(LIBS)
+ $(LINK) $(xmag_OBJECTS) $(xmag_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -358,84 +356,27 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmag-CutPaste.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmag-RootWin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmag-Scale.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmag-xmag.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CutPaste.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RootWin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Scale.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmag.Po@am__quote@
.c.o:
-@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
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@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" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-xmag-CutPaste.o: CutPaste.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-CutPaste.o -MD -MP -MF "$(DEPDIR)/xmag-CutPaste.Tpo" -c -o xmag-CutPaste.o `test -f 'CutPaste.c' || echo '$(srcdir)/'`CutPaste.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-CutPaste.Tpo" "$(DEPDIR)/xmag-CutPaste.Po"; else rm -f "$(DEPDIR)/xmag-CutPaste.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CutPaste.c' object='xmag-CutPaste.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-CutPaste.o `test -f 'CutPaste.c' || echo '$(srcdir)/'`CutPaste.c
-
-xmag-CutPaste.obj: CutPaste.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-CutPaste.obj -MD -MP -MF "$(DEPDIR)/xmag-CutPaste.Tpo" -c -o xmag-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)/xmag-CutPaste.Tpo" "$(DEPDIR)/xmag-CutPaste.Po"; else rm -f "$(DEPDIR)/xmag-CutPaste.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CutPaste.c' object='xmag-CutPaste.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-CutPaste.obj `if test -f 'CutPaste.c'; then $(CYGPATH_W) 'CutPaste.c'; else $(CYGPATH_W) '$(srcdir)/CutPaste.c'; fi`
-
-xmag-RootWin.o: RootWin.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-RootWin.o -MD -MP -MF "$(DEPDIR)/xmag-RootWin.Tpo" -c -o xmag-RootWin.o `test -f 'RootWin.c' || echo '$(srcdir)/'`RootWin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-RootWin.Tpo" "$(DEPDIR)/xmag-RootWin.Po"; else rm -f "$(DEPDIR)/xmag-RootWin.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='RootWin.c' object='xmag-RootWin.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-RootWin.o `test -f 'RootWin.c' || echo '$(srcdir)/'`RootWin.c
-
-xmag-RootWin.obj: RootWin.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-RootWin.obj -MD -MP -MF "$(DEPDIR)/xmag-RootWin.Tpo" -c -o xmag-RootWin.obj `if test -f 'RootWin.c'; then $(CYGPATH_W) 'RootWin.c'; else $(CYGPATH_W) '$(srcdir)/RootWin.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-RootWin.Tpo" "$(DEPDIR)/xmag-RootWin.Po"; else rm -f "$(DEPDIR)/xmag-RootWin.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='RootWin.c' object='xmag-RootWin.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-RootWin.obj `if test -f 'RootWin.c'; then $(CYGPATH_W) 'RootWin.c'; else $(CYGPATH_W) '$(srcdir)/RootWin.c'; fi`
-
-xmag-Scale.o: Scale.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-Scale.o -MD -MP -MF "$(DEPDIR)/xmag-Scale.Tpo" -c -o xmag-Scale.o `test -f 'Scale.c' || echo '$(srcdir)/'`Scale.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-Scale.Tpo" "$(DEPDIR)/xmag-Scale.Po"; else rm -f "$(DEPDIR)/xmag-Scale.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Scale.c' object='xmag-Scale.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-Scale.o `test -f 'Scale.c' || echo '$(srcdir)/'`Scale.c
-
-xmag-Scale.obj: Scale.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-Scale.obj -MD -MP -MF "$(DEPDIR)/xmag-Scale.Tpo" -c -o xmag-Scale.obj `if test -f 'Scale.c'; then $(CYGPATH_W) 'Scale.c'; else $(CYGPATH_W) '$(srcdir)/Scale.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-Scale.Tpo" "$(DEPDIR)/xmag-Scale.Po"; else rm -f "$(DEPDIR)/xmag-Scale.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Scale.c' object='xmag-Scale.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-Scale.obj `if test -f 'Scale.c'; then $(CYGPATH_W) 'Scale.c'; else $(CYGPATH_W) '$(srcdir)/Scale.c'; fi`
-
-xmag-xmag.o: xmag.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-xmag.o -MD -MP -MF "$(DEPDIR)/xmag-xmag.Tpo" -c -o xmag-xmag.o `test -f 'xmag.c' || echo '$(srcdir)/'`xmag.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-xmag.Tpo" "$(DEPDIR)/xmag-xmag.Po"; else rm -f "$(DEPDIR)/xmag-xmag.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmag.c' object='xmag-xmag.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-xmag.o `test -f 'xmag.c' || echo '$(srcdir)/'`xmag.c
-
-xmag-xmag.obj: xmag.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -MT xmag-xmag.obj -MD -MP -MF "$(DEPDIR)/xmag-xmag.Tpo" -c -o xmag-xmag.obj `if test -f 'xmag.c'; then $(CYGPATH_W) 'xmag.c'; else $(CYGPATH_W) '$(srcdir)/xmag.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xmag-xmag.Tpo" "$(DEPDIR)/xmag-xmag.Po"; else rm -f "$(DEPDIR)/xmag-xmag.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmag.c' object='xmag-xmag.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmag_CFLAGS) $(CFLAGS) -c -o xmag-xmag.obj `if test -f 'xmag.c'; then $(CYGPATH_W) 'xmag.c'; else $(CYGPATH_W) '$(srcdir)/xmag.c'; fi`
-uninstall-info-am:
install-appdefaultDATA: $(appdefault_DATA)
@$(NORMAL_INSTALL)
- test -z "$(appdefaultdir)" || $(mkdir_p) "$(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=$(am__strip_dir) \
@@ -452,7 +393,7 @@ uninstall-appdefaultDATA:
done
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
- test -z "$(appmandir)" || $(mkdir_p) "$(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=$(am__strip_dir) \
@@ -518,23 +459,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -545,10 +485,13 @@ 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 {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -623,7 +566,7 @@ distcheck: dist
$(am__remove_distdir)
@(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;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -647,7 +590,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -674,6 +617,7 @@ distclean-generic:
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 "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -697,12 +641,20 @@ info-am:
install-data-am: install-appdefaultDATA install-appmanDATA
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
Reply to: