debian/changelog | 2 rstart/ChangeLog | 283 ++- rstart/Makefile.am | 21 rstart/Makefile.in | 194 +- rstart/aclocal.m4 | 373 ++-- rstart/auth.c | 39 rstart/compile | 142 - rstart/config.guess | 152 + rstart/config.h.in | 39 rstart/config.sub | 199 +- rstart/configure | 4661 +++++++++++++++++++++++++++++++++------------------ rstart/configure.ac | 10 rstart/depcomp | 93 - rstart/install-sh | 514 +++-- rstart/missing | 61 rstart/mkinstalldirs | 111 - rstart/server.c | 242 +- rstart/server.h | 15 18 files changed, 4648 insertions(+), 2503 deletions(-)
New commits: commit 7e3e7b189960ee3684d2b4c18683a9dd252bcf3c Author: Julien Cristau <[email protected]> Date: Sun Aug 2 15:44:55 2009 +0200 rstart 1.0.3. diff --git a/debian/changelog b/debian/changelog index ec8db40..a4dbbb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ x11-session-utils (7.3+2) UNRELEASED; urgency=low * 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 diff --git a/rstart/ChangeLog b/rstart/ChangeLog index d7da8f9..0a828a5 100644 --- a/rstart/ChangeLog +++ b/rstart/ChangeLog @@ -1,45 +1,272 @@ -2006-04-26 Adam Jackson <[email protected]> +commit 1e32bed14ffe65f74433e2a2ec21f407d9536070 +Author: Julien Cristau <[email protected]> +Date: Sun Aug 2 15:16:02 2009 +0200 - * configure.ac: - Bump to 1.0.2. + Bump to 1.0.3 -2006-04-02 Adam Jackson <[email protected]> +commit 1679afa400192182cf29fd57c488b3d47aff1aa2 +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Thu Jan 15 18:09:19 2009 -0200 - * Makefile.am: - Bug #6425: srcdir != objdir build fix. (Yaakov Selkowitz) + 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-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c1eea0c7fc893c983d9f692e9c8643709d093551 +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Sat Nov 29 04:34:53 2008 -0200 - * configure.ac: - Update package version for X11R7 release. + VPATH build correction and s/git-/git /. + + This patch adds a missing correction available in + http://bugs.freedesktop.org/show_bug.cgi?id=17940 + that was not applied in alternate committed patch + 63c9c672a97a7e4a9434075958c68d8502624a40 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 61d9381ebc6bd5fa55b9021b8a68fff93e68059a +Author: James Cloos <[email protected]> +Date: Thu Dec 6 16:37:05 2007 -0500 - * configure.ac: - Update package version number for final X11R7 release candidate. + Replace static ChangeLog with dist-hook to generate from git log -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 5e8323af8c3adff08cb0f455fe54f28950e98223 +Author: James Cloos <[email protected]> +Date: Mon Sep 3 05:51:09 2007 -0400 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Add *~ to .gitignore to skip patch/emacs droppings -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fd77f3d067d0df0656d428f7289ccc6c3c5c1949 +Author: James Cloos <[email protected]> +Date: Thu Aug 23 19:24:35 2007 -0400 - * configure.ac: - Update package version number for X11R7 RC3 release. + Rename .cvsignore to .gitignore -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 63c9c672a97a7e4a9434075958c68d8502624a40 +Author: Kean Johnston <[email protected]> +Date: Sun Dec 3 05:12:39 2006 -0800 - * configure.ac: - Update package version number for RC1 release. + Don't use absolute pathnames when copying from ${srcdir}. -2005-10-13 Alan Coopersmith <[email protected]> +commit 2a016c91334ad0affaf6db9906325202179096fc +Author: Adam Jackson <[email protected]> +Date: Wed Apr 26 23:35:32 2006 +0000 - * Makefile.am: - * configure.ac: - Use cpp to fill in variables in man pages - -2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org> + Bump to - * Makefile.am: Add server.os2 to EXTRA_DIST +commit c10cbfc3619bdf8fe0c96d238cf4deeba8543757 +Author: Adam Jackson <[email protected]> +Date: Mon Apr 3 19:32:19 2006 +0000 + Bug #6425: srcdir != objdir build fix. (Yaakov Selkowitz) + +commit 203bb5fcd6c94f9f3dd6694e8225ed03d89c15a7 +Author: Kevin E Martin <[email protected]> +Date: Wed Dec 21 02:29:47 2005 +0000 + + Update package version for X11R7 release. + +commit d630c54f3e5f983e81ba1c3126089cb175ea759b +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 16:22:41 2005 +0000 + + Stub COPYING files + +commit 803021f3b61c5f41435f4bfc634dbf98bb70b428 +Author: Kevin E Martin <[email protected]> +Date: Thu Dec 15 00:24:03 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 102695adf6f26533e86d45b9fe8e61a83f300969 +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 d64c29bc96df9e5e31126ea6caf3560a657c36c0 +Author: Kevin E Martin <[email protected]> +Date: Sat Dec 3 05:49:17 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 39f0a98d456aa05a227ea3e85e7aee6c0406a317 +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 28 22:01:38 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 fa6b5809fb54bc9f4fa8e81f46ab55d6042e8fb2 +Author: Eric Anholt <[email protected]> +Date: Mon Nov 21 10:34:57 2005 +0000 + + Another pass at .cvsignores for apps. + +commit d07abeadc55b3edc8c97534593b4b0f48729c62f +Author: Eric Anholt <[email protected]> +Date: Sun Nov 20 22:08:49 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit 8da96206210461f1f43b8b0ff6a78d36549b06bb +Author: Kevin E Martin <[email protected]> +Date: Wed Oct 19 02:47:50 2005 +0000 + + Update package version number for RC1 release. + +commit 1462f8bf2027a6bd0864b5073fae33c8622ade80 +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 8c93946dc0a6d04fa9633069d89d62dcb64a985a +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 14 21:59:06 2005 +0000 + + Missed changelog in yesterday's commit + +commit 946902bf607734c4253dab800d45691b10f7dd37 +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 14 01:28:06 2005 +0000 + + Use cpp to fill in variables in man pages + +commit 4ec4f04ad354b019532f3603de9e2d03081fdd85 +Author: Alan Coopersmith <[email protected]> +Date: Thu Oct 6 20:13:14 2005 +0000 + + Fix cpp generation of scripts & config files Add --with flags to configure + for setting default $PATH & $MANPATH + +commit 4a4e84476cb47b280a2b87a96897c394b6d77768 +Author: Alan Coopersmith <[email protected]> +Date: Wed Oct 5 16:08:27 2005 +0000 + + Add missing $(DESTDIR)s to custom install targets + +commit 49b173b1f90f75294dab19f622f8f13f421a5b44 +Author: Kevin E Martin <[email protected]> +Date: Tue Oct 4 23:31:22 2005 +0000 + + Add server.os2 to EXTRA_DIST + +commit 12ba788dcac295641271af315f4742a82732f5ab +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 bc98cab949400a2c0191c586b0ba29d2d89b2c90 +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 344b91c599fec33db6d7c96c806dab6acce47934 +Author: Kevin E Martin <[email protected]> +Date: Thu Jul 28 15:57:12 2005 +0000 + + Fix distcheck for remaining apps + +commit 6a2e9e6f18e3b214e375d4b79f66ec6f3fbeadcd +Author: Matthieu Herrb <[email protected]> +Date: Sat Jul 23 17:43:20 2005 +0000 + + fix make install when builddir != srcdir + +commit 0188681c8275738ab27c7618d1fd827c6556dc15 +Author: Matthieu Herrb <[email protected]> +Date: Sat Jul 23 17:42:47 2005 +0000 + + Probe for rm and ln that are used during make install. + +commit 6b1ff419a810eea0c3c93b25d74e2012b506d837 +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 1665633fc9c566e909d6bf23648844b45a5c1e75 +Author: Matthieu Herrb <[email protected]> +Date: Sun Jul 17 20:11:01 2005 +0000 + + fix rules to work with non-GNU make and outside of $srcdir + +commit bdc2b9966d510b9ceb5fa0c0fc699950fdb1bfdf +Author: Søren Sandmann Pedersen <[email protected]> +Date: Thu Jul 7 22:34:16 2005 +0000 + + Build system for rstart + +commit 2fedc84e2356a2c7c9621e9a5a498305835b25cf +Author: Egbert Eich <[email protected]> +Date: Fri Apr 23 19:54:37 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 0b9fd8109dc7d2e90e97be9cc23b58152dccc620 +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 60c0a3d9cc0729922e457290f062c674d3d8681f +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 3283d8fafa02c9e93a71ad83f2f3788c9cb54e2a +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit bc9710352c3e369ffc442826ef729c1e505a3954 +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 28544d3d210e769557639c6494205bec83f39d7e +Author: Egbert Eich <[email protected]> +Date: Thu Jan 29 08:09:02 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit 129d33aeda28f4c0970e70e537196d1f9a83e3a9 +Author: Kaleb Keithley <[email protected]> +Date: Tue Nov 25 19:29:03 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 719e9d3f369ff71c4eef2f8e1a72b075b6c6490b +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:58 2003 +0000 + + XFree86 4.3.0.1 + +commit 2416645e0f054d5b400a1ab22065acbe3d7bffb6 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:58 2003 +0000 + + Initial revision + +commit 86113ea526160c917e7471dd8c54d99ed4f497a7 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 15:54:53 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/rstart/Makefile.am b/rstart/Makefile.am index b27ac49..4cf902e 100644 --- a/rstart/Makefile.am +++ b/rstart/Makefile.am @@ -32,7 +32,8 @@ rstartd_real_LDADD = $(RSTART_LIBS) rstartd_real_SOURCES = \ auth.c \ - server.c + server.c \ + server.h # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM # to cpp, because that trick does not work on all ANSI C preprocessors. @@ -102,7 +103,8 @@ CLEANFILES = rstart rstartd config $(appman_DATA) DATA_DIR = $(libdir)/X11/rstart install-data-hook: - for name in `find ${srcdir}/commands -print | grep -v CVS` ; do \ + (cd ${srcdir}; \ + for name in `find ./commands -print | grep -v CVS` ; do \ if test -f $$name; then \ sed \ -e 's,ENVPREFIX,RSTART,g' \ @@ -120,7 +122,7 @@ install-data-hook: fi; \ done; \ \ - for name in `find ${srcdir}/contexts -print | grep -v CVS` ; do \ + for name in `find ./contexts -print | grep -v CVS` ; do \ if test -f $$name; then \ sed \ -e 's,_PATH,$(DEFAULT_USER_PATH),g' \ @@ -132,9 +134,10 @@ install-data-hook: fi ; \ fi ; \ done; \ + ); \ \ cd $(DESTDIR)$(DATA_DIR)/contexts; \ - sed -e '/^$$/d' -e '/^#/d' ${srcdir}/contexts/@Aliases | \ + sed -e '/^$$/d' -e '/^#/d' @Aliases | \ while read real aliases; do \ for i in $$aliases; do \ $(RM) $$i; \ @@ -186,3 +189,13 @@ EXTRA_DIST += \ samples/contexts.odt1/x11r6 \ samples/contexts.odt1/@List \ samples/contexts.odt1/openwindows3 + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/rstart/Makefile.in b/rstart/Makefile.in index e9a4015..bfa2f01 100644 --- a/rstart/Makefile.in +++ b/rstart/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 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 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. @@ -39,15 +39,11 @@ -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 @@ -62,19 +58,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ rstart_server_PROGRAMS = rstartd.real$(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)$(rstart_serverdir)" \ @@ -87,9 +82,11 @@ am_rstartd_real_OBJECTS = rstartd_real-auth.$(OBJEXT) \ rstartd_real_OBJECTS = $(am_rstartd_real_OBJECTS) am__DEPENDENCIES_1 = rstartd_real_DEPENDENCIES = $(am__DEPENDENCIES_1) +rstartd_real_LINK = $(CCLD) $(rstartd_real_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = -...@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -119,12 +116,9 @@ am__remove_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@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -135,8 +129,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_USER_PATH = @DEFAULT_USER_PATH@ DEFAULT_X_MANPATH = @DEFAULT_X_MANPATH@ @@ -147,9 +143,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@ @@ -162,11 +161,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LN = @LN@ 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@ @@ -187,9 +185,11 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ 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@ @@ -201,8 +201,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@ @@ -228,8 +230,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ rstart_serverdir = $(libdir)/X11/rstart rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ -DSERVERNAME=\"rstart\" \ @@ -238,7 +244,8 @@ rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ rstartd_real_LDADD = $(RSTART_LIBS) rstartd_real_SOURCES = \ auth.c \ - server.c + server.c \ + server.h # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM @@ -294,7 +301,7 @@ EXTRA_DIST = client.cpp server.cpp config.cpp $(appman_PRE) server.os2 \ samples/contexts.odt1/default samples/contexts.odt1/@Aliases \ samples/contexts.odt1/x11r5 samples/contexts.odt1/odt1 \ samples/contexts.odt1/x11r6 samples/contexts.odt1/@List \ - samples/contexts.odt1/openwindows3 + samples/contexts.odt1/openwindows3 ChangeLog CLEANFILES = rstart rstartd config $(appman_DATA) # @@ -304,6 +311,7 @@ CLEANFILES = rstart rstartd config $(appman_DATA) # FIXME: Someone who cares about rstart may want to look into sanitizing # the stuff below. DATA_DIR = $(libdir)/X11/rstart +MAINTAINERCLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -346,7 +354,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 @@ -361,7 +369,7 @@ distclean-hdr: -rm -f config.h stamp-h1 install-rstart_serverPROGRAMS: $(rstart_server_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(rstart_serverdir)" || $(mkdir_p) "$(DESTDIR)$(rstart_serverdir)" + test -z "$(rstart_serverdir)" || $(MKDIR_P) "$(DESTDIR)$(rstart_serverdir)" @list='$(rstart_server_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -384,10 +392,10 @@ clean-rstart_serverPROGRAMS: -test -z "$(rstart_server_PROGRAMS)" || rm -f $(rstart_server_PROGRAMS) rstartd.real$(EXEEXT): $(rstartd_real_OBJECTS) $(rstartd_real_DEPENDENCIES) @rm -f rstartd.real$(EXEEXT) - $(LINK) $(rstartd_real_LDFLAGS) $(rstartd_real_OBJECTS) $(rstartd_real_LDADD) $(LIBS) + $(rstartd_real_LINK) $(rstartd_real_OBJECTS) $(rstartd_real_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -415,50 +423,49 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/rstartd_real-server...@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) '$<'` rstartd_real-auth.o: auth.c -...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-auth.o -MD -MP -MF "$(DEPDIR)/rstartd_real-auth.Tpo" -c -o rstartd_real-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c; \ -...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/rstartd_real-auth.Tpo" "$(DEPDIR)/rstartd_real-auth.Po"; else rm -f "$(DEPDIR)/rstartd_real-auth.Tpo"; exit 1; fi +...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-auth.o -MD -MP -MF $(DEPDIR)/rstartd_real-auth.Tpo -c -o rstartd_real-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c +...@am__fastdepcc_true@ mv -f $(DEPDIR)/rstartd_real-auth.Tpo $(DEPDIR)/rstartd_real-auth.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='auth.c' object='rstartd_real-auth.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) $(rstartd_real_CFLAGS) $(CFLAGS) -c -o rstartd_real-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c rstartd_real-auth.obj: auth.c -...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-auth.obj -MD -MP -MF "$(DEPDIR)/rstartd_real-auth.Tpo" -c -o rstartd_real-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`; \ -...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/rstartd_real-auth.Tpo" "$(DEPDIR)/rstartd_real-auth.Po"; else rm -f "$(DEPDIR)/rstartd_real-auth.Tpo"; exit 1; fi +...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-auth.obj -MD -MP -MF $(DEPDIR)/rstartd_real-auth.Tpo -c -o rstartd_real-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi` +...@am__fastdepcc_true@ mv -f $(DEPDIR)/rstartd_real-auth.Tpo $(DEPDIR)/rstartd_real-auth.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='auth.c' object='rstartd_real-auth.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) $(rstartd_real_CFLAGS) $(CFLAGS) -c -o rstartd_real-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi` rstartd_real-server.o: server.c -...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-server.o -MD -MP -MF "$(DEPDIR)/rstartd_real-server.Tpo" -c -o rstartd_real-server.o `test -f 'server.c' || echo '$(srcdir)/'`server.c; \ -...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/rstartd_real-server.Tpo" "$(DEPDIR)/rstartd_real-server.Po"; else rm -f "$(DEPDIR)/rstartd_real-server.Tpo"; exit 1; fi +...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-server.o -MD -MP -MF $(DEPDIR)/rstartd_real-server.Tpo -c -o rstartd_real-server.o `test -f 'server.c' || echo '$(srcdir)/'`server.c +...@am__fastdepcc_true@ mv -f $(DEPDIR)/rstartd_real-server.Tpo $(DEPDIR)/rstartd_real-server.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='server.c' object='rstartd_real-server.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) $(rstartd_real_CFLAGS) $(CFLAGS) -c -o rstartd_real-server.o `test -f 'server.c' || echo '$(srcdir)/'`server.c rstartd_real-server.obj: server.c -...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-server.obj -MD -MP -MF "$(DEPDIR)/rstartd_real-server.Tpo" -c -o rstartd_real-server.obj `if test -f 'server.c'; then $(CYGPATH_W) 'server.c'; else $(CYGPATH_W) '$(srcdir)/server.c'; fi`; \ -...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/rstartd_real-server.Tpo" "$(DEPDIR)/rstartd_real-server.Po"; else rm -f "$(DEPDIR)/rstartd_real-server.Tpo"; exit 1; fi +...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rstartd_real_CFLAGS) $(CFLAGS) -MT rstartd_real-server.obj -MD -MP -MF $(DEPDIR)/rstartd_real-server.Tpo -c -o rstartd_real-server.obj `if test -f 'server.c'; then $(CYGPATH_W) 'server.c'; else $(CYGPATH_W) '$(srcdir)/server.c'; fi` +...@am__fastdepcc_true@ mv -f $(DEPDIR)/rstartd_real-server.Tpo $(DEPDIR)/rstartd_real-server.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='server.c' object='rstartd_real-server.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) $(rstartd_real_CFLAGS) $(CFLAGS) -c -o rstartd_real-server.obj `if test -f 'server.c'; then $(CYGPATH_W) 'server.c'; else $(CYGPATH_W) '$(srcdir)/server.c'; fi` -uninstall-info-am: 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) \ @@ -475,7 +482,7 @@ uninstall-appmanDATA: done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -496,8 +503,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -509,8 +516,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -520,13 +527,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -541,24 +547,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/commands $(distdir)/commands/x11r6 $(distdir)/contexts $(distdir)/samples/commands $(distdir)/samples/commands/odt1 $(distdir)/samples/commands/openwindows2 $(distdir)/samples/commands/openwindows3 $(distdir)/samples/commands/x11r5 $(distdir)/samples/contexts.odt1 - @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; \ @@ -569,10 +573,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 @@ -581,6 +588,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -608,6 +619,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -647,7 +660,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' distcleancheck: distclean @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ @@ -662,7 +675,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h installdirs: for dir in "$(DESTDIR)$(rstart_serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -689,6 +702,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-generic clean-rstart_serverPROGRAMS mostlyclean-am @@ -715,12 +729,20 @@ install-data-am: install-appmanDATA install-configDATA \ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + install-exec-am: install-binSCRIPTS +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 @@ -743,25 +765,28 @@ ps: ps-am ps-am: uninstall-am: uninstall-appmanDATA uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-info-am \ - uninstall-rstart_serverPROGRAMS + uninstall-configDATA uninstall-rstart_serverPROGRAMS + +.MAKE: install-am install-data-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-generic clean-rstart_serverPROGRAMS ctags dist dist-all \ - dist-bzip2 dist-gzip 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-appmanDATA install-binSCRIPTS install-configDATA \ - install-data install-data-am install-data-hook install-exec \ - install-exec-am install-info install-info-am install-man \ + dist-bzip2 dist-gzip dist-hook dist-lzma 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-appmanDATA \ + install-binSCRIPTS install-configDATA install-data \ + install-data-am install-data-hook install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am \ install-rstart_serverPROGRAMS install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-appmanDATA uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-info-am \ - uninstall-rstart_serverPROGRAMS + uninstall-configDATA uninstall-rstart_serverPROGRAMS config: config.cpp @@ -781,7 +806,8 @@ rstartd: server.cpp $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ install-data-hook: - for name in `find ${srcdir}/commands -print | grep -v CVS` ; do \ + (cd ${srcdir}; \ + for name in `find ./commands -print | grep -v CVS` ; do \ if test -f $$name; then \ sed \ -e 's,ENVPREFIX,RSTART,g' \ @@ -799,7 +825,7 @@ install-data-hook: fi; \ done; \ \ - for name in `find ${srcdir}/contexts -print | grep -v CVS` ; do \ + for name in `find ./contexts -print | grep -v CVS` ; do \ if test -f $$name; then \ sed \ -e 's,_PATH,$(DEFAULT_USER_PATH),g' \ @@ -811,9 +837,10 @@ install-data-hook: fi ; \ fi ; \ done; \ + ); \ \ cd $(DESTDIR)$(DATA_DIR)/contexts; \ - sed -e '/^$$/d' -e '/^#/d' ${srcdir}/contexts/@Aliases | \ + sed -e '/^$$/d' -e '/^#/d' @Aliases | \ while read real aliases; do \ for i in $$aliases; do \ $(RM) $$i; \ @@ -826,6 +853,13 @@ install-data-hook: distuninstallcheck: @: + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/rstart/aclocal.m4 b/rstart/aclocal.m4 index 8fa6fea..5945470 100644 --- a/rstart/aclocal.m4 +++ b/rstart/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file 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. @@ -11,6 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # # Copyright © 2004 Scott James Remnant <[email protected]>. @@ -159,7 +167,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -169,6 +177,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES +dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. dnl @@ -216,7 +225,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.1 + [XORG_MACROS_version=1.2.1 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -250,6 +259,10 @@ else if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS=-undef AC_MSG_RESULT([yes]) + # under Cygwin unix is still defined even with -undef + elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS="-undef -ansi" + AC_MSG_RESULT([yes, with -ansi]) else AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
