debian/README.source | 73 debian/changelog | 9 debian/control | 2 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs.mk | 21 debian/xsfbs/xsfbs.sh | 311 --- smproxy/ChangeLog | 227 ++ smproxy/INSTALL | 236 -- smproxy/Makefile.am | 14 smproxy/Makefile.in | 401 ++-- smproxy/README | 26 smproxy/aclocal.m4 | 1847 ++++++++++++--------- smproxy/compile | 142 - smproxy/config.guess | 107 - smproxy/config.h.in | 41 smproxy/config.sub | 128 + smproxy/configure | 4148 ++++++++++++++++++++++++++++++++----------------- smproxy/configure.ac | 14 smproxy/depcomp | 172 +- smproxy/install-sh | 517 ++++-- smproxy/missing | 104 - smproxy/mkinstalldirs | 158 - smproxy/save.c | 65 smproxy/smproxy.c | 316 +-- smproxy/smproxy.h | 3 smproxy/smproxy.man | 2 26 files changed, 5353 insertions(+), 3763 deletions(-)
New commits: commit 1150ef1882752e5e0dec7801a59ea0b2ce07a8c1 Author: Brice Goglin <[email protected]> Date: Sun Dec 6 22:55:36 2009 +0100 Prepare Changelog for upload diff --git a/debian/changelog b/debian/changelog index 74ec426..6d42889 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-session-utils (7.3+2) UNRELEASED; urgency=low +x11-session-utils (7.5+1) unstable; urgency=low [ Julien Cristau ] * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building @@ -10,7 +10,7 @@ x11-session-utils (7.3+2) UNRELEASED; urgency=low * smproxy 1.0.3. * Add README.source, bump Standards-Version to 3.8.3. - -- Brice Goglin <[email protected]> Sun, 06 Dec 2009 22:54:55 +0100 + -- Brice Goglin <[email protected]> Sun, 06 Dec 2009 22:55:25 +0100 x11-session-utils (7.3+1) unstable; urgency=low commit 12f8c87fabbe298d5a2bac582b0507978769c20c Author: Brice Goglin <[email protected]> Date: Sun Dec 6 22:55:07 2009 +0100 Add README.source, bump Standards-Version to 3.8.3 diff --git a/debian/changelog b/debian/changelog index 7b9bba5..74ec426 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ x11-session-utils (7.3+2) UNRELEASED; urgency=low [ Brice Goglin ] * smproxy 1.0.3. + * Add README.source, bump Standards-Version to 3.8.3. - -- Brice Goglin <[email protected]> Sun, 06 Dec 2009 22:50:51 +0100 + -- Brice Goglin <[email protected]> Sun, 06 Dec 2009 22:54:55 +0100 x11-session-utils (7.3+1) unstable; urgency=low diff --git a/debian/control b/debian/control index f61d5ab..d1560f7 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libxaw7-dev (>= 1:1.0.1-1), lib # rstart: # smproxy: libxt-dev, libxmu-dev # xsm: openssh-client | ssh, libxaw7-dev, libxt-dev -Standards-Version: 3.7.2.0 +Standards-Version: 3.8.3 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git commit 543e93788be20ad0795c1ac5992730291ba7df18 Author: Brice Goglin <[email protected]> Date: Sun Dec 6 22:51:04 2009 +0100 smproxy 1.0.3 diff --git a/debian/changelog b/debian/changelog index a4dbbb7..7b9bba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ x11-session-utils (7.3+2) UNRELEASED; urgency=low + [ Julien Cristau ] * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building the apps in parallel. Install is still sequential, at least for now. * rstart 1.0.3. + updated config.{guess,sub}, with avr32 support (closes: #535714) - -- Julien Cristau <[email protected]> Sun, 03 Aug 2008 00:44:23 +0200 + [ Brice Goglin ] + * smproxy 1.0.3. + + -- Brice Goglin <[email protected]> Sun, 06 Dec 2009 22:50:51 +0100 x11-session-utils (7.3+1) unstable; urgency=low diff --git a/smproxy/ChangeLog b/smproxy/ChangeLog index 5729fd2..122d8b7 100644 --- a/smproxy/ChangeLog +++ b/smproxy/ChangeLog @@ -1,35 +1,220 @@ -2006-04-01 Adam Jackson <[email protected]> +commit 170f17b373da6f45db8bce2f0b3cc18b9f05e6bd +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 16 16:32:38 2009 -0700 - * configure.ac: - Bump to 1.0.2. + smproxy 1.0.3 + + Signed-off-by: Alan Coopersmith <[email protected]> -2006-02-03 Alan Coopersmith <[email protected]> +commit db43f974d4b653cc903dbbc9d22fca0711cf0ee6 +Author: Alan Coopersmith <[email protected]> +Date: Mon Oct 12 18:31:59 2009 -0700 - * smproxy.man: - Wrong name in .TH line in smproxy man page. + Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <[email protected]> -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6519b61438b36e66a42e44b42fbf6b7f75a450d0 +Author: Alan Coopersmith <[email protected]> +Date: Thu Oct 1 14:54:19 2009 -0700 - * configure.ac: - Update package version for X11R7 release. + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <[email protected]> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c2514a2a3fb2e01f904d9a0e4b4b50bf24ed316d +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Mon Jan 19 16:38:49 2009 -0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects + make distcheck and all gcc 4.3 and sparse warnings. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c3f8e7bd4dcb059265ad47152c57305b1ebf1652 +Author: James Cloos <[email protected]> +Date: Thu Dec 6 16:37:07 2007 -0500 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Replace static ChangeLog with dist-hook to generate from git log -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c1e12fb138711721d74d9c4accf1c76f1829a411 +Author: James Cloos <[email protected]> +Date: Mon Sep 3 05:51:12 2007 -0400 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add *~ to .gitignore to skip patch/emacs droppings -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 142c50a44b9bca6ecc2d137a52f3a2d2d18ea753 +Author: James Cloos <[email protected]> +Date: Thu Aug 23 19:24:37 2007 -0400 - * configure.ac: - Update package version number for RC1 release. + Rename .cvsignore to .gitignore +commit a712e5b1ac3fba792e2696a52781fee3ac7f2c26 +Author: Adam Jackson <[email protected]> +Date: Sun Apr 2 00:43:00 2006 +0000 + + Bump to 1.0.2 + +commit 5df8681ca60408ec2b0f2e73930cf34d46474e02 +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 3 23:24:37 2006 +0000 + + Wrong name in .TH line in smproxy man page. + +commit 129d0d20f0fe3b4e2d007b40eb8d18493e72feb5 +Author: Kevin E Martin <[email protected]> +Date: Wed Dec 21 02:29:47 2005 +0000 + + Update package version for X11R7 release. + +commit a24c9fb0dfc98f5e2a1c530b2e5623ca37085e92 +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 16:22:41 2005 +0000 + + Stub COPYING files + +commit ca04f02395af13eb7411b6d7a2235441260162ed +Author: Kevin E Martin <[email protected]> +Date: Thu Dec 15 00:24:04 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 8bfee9823e3352b2b891815fb17ac8b4b0b9ec1f +Author: Kevin E Martin <[email protected]> +Date: Tue Dec 6 22:48:18 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit c6ddfcb8295f9bd95ff6c10dfc72eb06c1dfebfc +Author: Kevin E Martin <[email protected]> +Date: Sat Dec 3 05:49:17 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 1cda990e2da2c81676263a743148792cdd24bf76 +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 28 22:01:39 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 f316c47cd92a8787aa054454b328992ea5a1c335 +Author: Eric Anholt <[email protected]> +Date: Mon Nov 21 10:34:58 2005 +0000 + + Another pass at .cvsignores for apps. + +commit adf4750e5d0b867f9aebcb9e04f45615c78d564b +Author: Eric Anholt <[email protected]> +Date: Sun Nov 20 22:08:50 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit 62c0c632565fc25c6af2199fecc1e8cec21beb82 +Author: Kevin E Martin <[email protected]> +Date: Wed Oct 19 02:47:50 2005 +0000 + + Update package version number for RC1 release. + +commit 7154ca09d51094eee67bd38d35ea1a42f0243165 +Author: Alan Coopersmith <[email protected]> +Date: Mon Oct 17 23:56:20 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 4b08eb40f81ad4ac6f276d91a485e7eb3d690a61 +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 14 00:25:42 2005 +0000 + + Use sed to fill in variables in man page + +commit 8be426eb8e1d2be0264c34bd618a25822055fcc6 +Author: Alan Coopersmith <[email protected]> +Date: Mon Aug 1 20:25:28 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit a1da8fe3444ec4373d823b55d3db4c20f70b813c +Author: Kevin E Martin <[email protected]> +Date: Fri Jul 29 21:22:30 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 1c36f6e6523670598c310ad5cd55e6e3c800ba36 +Author: Adam Jackson <[email protected]> +Date: Wed Jul 20 19:31:50 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 4c13f27d1178fa4c1176686d53c5641addf675b8 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 16 22:07:13 2005 +0000 + + Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get + HAS_MKSTEMP defined in modular builds. + +commit b3d8e92288c109bec89946ae3d550616dbc8d04c +Author: Alan Coopersmith <[email protected]> +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 05ef9ba24d0b1b5c17e04036d03770a44efd6b78 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Jul 6 17:25:57 2005 +0000 + + Build system for smproxy + +commit 2935d0350a985e7638cdeaa32b06d935bef2a983 +Author: Egbert Eich <[email protected]> +Date: Fri Apr 23 19:54:37 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 5bab1fd41c825d7e89cd7329eead0169640cc3dd +Author: Egbert Eich <[email protected]> +Date: Sun Mar 14 08:34:56 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit c43c8cfd14136c9486ddf269a0e876c20670848e +Author: Egbert Eich <[email protected]> +Date: Wed Mar 3 12:12:54 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit ad7fbb2be57bc3aef4b403b3e3341627c98d88b6 +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit b3303bf17a8975b4a3f13462cb7b13207a016395 +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 09:23:57 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 2a637a09ff68246161945821392656492f1fbde1 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:58 2003 +0000 + + XFree86 4.3.0.1 + +commit f4d5033f594bf278ff1171091219b3c28dc45446 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 15:54:53 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/smproxy/INSTALL b/smproxy/INSTALL index 23e5f25..e69de29 100644 --- a/smproxy/INSTALL +++ b/smproxy/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/smproxy/Makefile.am b/smproxy/Makefile.am index 7d6244d..70c8a0e 100644 --- a/smproxy/Makefile.am +++ b/smproxy/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = smproxy -smproxy_CFLAGS = $(SMPROXY_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(SMPROXY_CFLAGS) smproxy_LDADD = $(SMPROXY_LIBS) smproxy_SOURCES = \ @@ -62,4 +62,14 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/smproxy/Makefile.in b/smproxy/Makefile.in index 4ec4af1..427b547 100644 --- a/smproxy/Makefile.in +++ b/smproxy/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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 +37,12 @@ # PERFORMANCE OF THIS SOFTWARE. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ 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,35 +57,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = smproxy$(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 = +CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_smproxy_OBJECTS = smproxy-save.$(OBJEXT) smproxy-smproxy.$(OBJEXT) +am_smproxy_OBJECTS = save.$(OBJEXT) smproxy.$(OBJEXT) smproxy_OBJECTS = $(am_smproxy_OBJECTS) am__DEPENDENCIES_1 = smproxy_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = -...@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(smproxy_SOURCES) DIST_SOURCES = $(smproxy_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -95,8 +105,22 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -appmanDATA_INSTALL = $(INSTALL_DATA) +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' DATA = $(appman_DATA) ETAGS = etags CTAGS = ctags @@ -104,19 +128,17 @@ 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); }; } + { 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@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AUTOCONF = @AUTOCONF@ @@ -126,7 +148,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -135,9 +160,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -149,11 +177,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@ @@ -169,9 +196,11 @@ SMPROXY_CFLAGS = @SMPROXY_CFLAGS@ SMPROXY_LIBS = @SMPROXY_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ +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@ @@ -183,8 +212,10 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -210,9 +241,13 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -smproxy_CFLAGS = $(SMPROXY_CFLAGS) +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = $(CWARNFLAGS) $(SMPROXY_CFLAGS) smproxy_LDADD = $(SMPROXY_LIBS) smproxy_SOURCES = \ save.c \ @@ -224,7 +259,7 @@ appman_PRE = \ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:m...@app_man_suffix@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) SED = sed @@ -245,6 +280,7 @@ MAN_SUBSTS = \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man +MAINTAINERCLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -256,15 +292,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -280,21 +316,22 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(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 @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -302,30 +339,44 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - 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; \ - else :; fi; \ - done + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done 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"; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) smproxy$(EXEEXT): $(smproxy_OBJECTS) $(smproxy_DEPENDENCIES) @rm -f smproxy$(EXEEXT) - $(LINK) $(smproxy_LDFLAGS) $(smproxy_OBJECTS) $(smproxy_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(smproxy_OBJECTS) $(smproxy_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -333,151 +384,138 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/smproxy-save...@am__quote@ -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/smproxy-smproxy...@am__quote@ +...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/save...@am__quote@ +...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/smproxy...@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@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +...@am__fastdepcc_true@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +...@am__fastdepcc_false@ $(AM_V_CC) @AM_BACKSLASH@ @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@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +...@am__fastdepcc_true@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +...@am__fastdepcc_false@ $(AM_V_CC) @AM_BACKSLASH@ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
