xinit: Changes to 'debian-unstable'
ChangeLog | 139 +
Makefile.am | 12
Makefile.in | 188 +-
configure | 1557 +++++++++++++++++++-
configure.ac | 38
debian/changelog | 6
debian/patches/001_debian_xinitrc.diff | 18
debian/patches/02_startx_hostname.diff | 8
debian/patches/03_debian_startx_manpage.diff | 4
debian/patches/04_startx_paths.diff | 20
debian/patches/06_move_serverauthfile_into_tmp.diff | 8
org.x.X11.plist.cpp | 27
org.x.startx.plist.cpp | 25
privileged_startx/10-tmpdirs.cpp | 37
privileged_startx/20-font_cache.cpp | 35
privileged_startx/Makefile.am | 74
privileged_startx/Makefile.in | 621 +++++++
privileged_startx/client.c | 56
privileged_startx/org.x.privileged_startx.plist.cpp | 21
privileged_startx/privileged_startx.c | 59
privileged_startx/privileged_startx.defs | 40
privileged_startx/privileged_startx_types.h | 6
privileged_startx/server.c | 250 +++
startx.cpp | 29
xinit.c | 89 -
xinitrc.cpp | 12
26 files changed, 3148 insertions(+), 231 deletions(-)
New commits:
commit 4c4bc633f782f6f6ad3bb0784acffb9a66c83bf0
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed May 21 23:29:03 2008 +0200
prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 75cd3d4..3823eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xinit (1.0.9-1) UNRELEASED; urgency=low
+xinit (1.0.9-1) unstable; urgency=low
* New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Wed, 21 May 2008 23:21:58 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 21 May 2008 23:28:57 +0200
xinit (1.0.8-1) unstable; urgency=low
commit d066356f647cae9c8476d7e2274e848ae700dfb3
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed May 21 23:28:49 2008 +0200
New upstream release
diff --git a/privileged_startx/Makefile.in b/privileged_startx/Makefile.in
new file mode 100644
index 0000000..f8ab59a
--- /dev/null
+++ b/privileged_startx/Makefile.in
@@ -0,0 +1,621 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2008 Apple Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+# HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above
+# copyright holders shall not be used in advertising or otherwise to
+# promote the sale, use or other dealings in this Software without
+# prior written authorization.
+
+# 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.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/cpprules.in
+xinitrc_PROGRAMS = privileged_startx$(EXEEXT)
+subdir = privileged_startx
+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)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(xinitrcdir)" \
+ "$(DESTDIR)$(privstartxdir)" "$(DESTDIR)$(launchdaemonsdir)"
+xinitrcPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(xinitrc_PROGRAMS)
+dist_privileged_startx_OBJECTS = server.$(OBJEXT) client.$(OBJEXT) \
+ privileged_startx.$(OBJEXT)
+nodist_privileged_startx_OBJECTS = privileged_startxServer.$(OBJEXT) \
+ privileged_startxUser.$(OBJEXT)
+privileged_startx_OBJECTS = $(dist_privileged_startx_OBJECTS) \
+ $(nodist_privileged_startx_OBJECTS)
+privileged_startx_LDADD = $(LDADD)
+privstartxSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(privstartx_SCRIPTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(dist_privileged_startx_SOURCES) \
+ $(nodist_privileged_startx_SOURCES)
+DIST_SOURCES = $(dist_privileged_startx_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+launchdaemonsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(launchdaemons_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+ARCHMANDEFS = @ARCHMANDEFS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+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@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MCOOKIE = @MCOOKIE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHELL_CMD = @SHELL_CMD@
+STARTX_COOKIE_FLAGS = @STARTX_COOKIE_FLAGS@
+STRIP = @STRIP@
+TWM = @TWM@
+VERSION = @VERSION@
+XAUTH = @XAUTH@
+XCLOCK = @XCLOCK@
+XINIT = @XINIT@
+XINIT_CFLAGS = @XINIT_CFLAGS@
+XINIT_LIBS = @XINIT_LIBS@
+XMODMAP = @XMODMAP@
+XRDB = @XRDB@
+XSERVER = @XSERVER@
+XTERM = @XTERM@
+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__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+launchagentsdir = @launchagentsdir@
+launchdaemonsdir = @launchdaemonsdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ -e '/^\#line *[0-9][0-9]* *.*$$/d' \
+ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
+ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+ -e '/^[ ]*XHASH/s/XHASH/\#/' \
+ -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \
+ -e '/\@\@$$/s/\@\@$$/\\/'
+
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+XORGMANNAME = X Version 11
+MANDEFS = \
+ -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
+ -D__appmansuffix__=$(APP_MAN_SUFFIX) \
+ -D__filemansuffix__=$(FILE_MAN_SUFFIX) \
+ -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
+ -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
+ -D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \
+ -D__xinitdir__=$(XINITDIR) \
+ -D__bindir__=$(bindir) \
+ -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS)
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp
+xinitrcdir = $(libdir)/X11/xinit
+privstartxdir = $(xinitrcdir)/privileged_startx.d
+privstartx_SCRIPTS = 10-tmpdirs 20-font_cache
+AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\"
+CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)"
+dist_privileged_startx_SOURCES = \
+ server.c \
+ client.c \
+ privileged_startx.c
+
+nodist_privileged_startx_SOURCES = \
+ privileged_startxServer.c \
+ privileged_startxUser.c
+
+BUILT_SOURCES = \
+ privileged_startxServer.c \
+ privileged_startxUser.c \
+ privileged_startxServer.h \
+ privileged_startx.h
+
+launchdaemons_PRE = org.x.privileged_startx.plist.cpp
+launchdaemons_DATA = $(launchdaemons_PRE:plist.cpp=plist)
+CLEANFILES = \
+ $(privstartx_SCRIPTS) \
+ $(BUILT_SOURCES) \
+ $(launchdaemons_DATA)
+
+EXTRA_DIST = \
+ 10-tmpdirs.cpp \
+ 20-font_cache.cpp \
+ org.x.privileged_startx.plist.cpp \
+ privileged_startx.defs \
+ privileged_startx_types.h
+
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .$(APP_MAN_SUFFIX) .man .cpp .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/cpprules.in $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu privileged_startx/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu privileged_startx/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-xinitrcPROGRAMS: $(xinitrc_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(xinitrcdir)" || $(MKDIR_P) "$(DESTDIR)$(xinitrcdir)"
+ @list='$(xinitrc_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) $(xinitrcPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(xinitrcdir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(xinitrcPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(xinitrcdir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+uninstall-xinitrcPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(xinitrc_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(xinitrcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(xinitrcdir)/$$f"; \
+ done
+
+clean-xinitrcPROGRAMS:
+ -test -z "$(xinitrc_PROGRAMS)" || rm -f $(xinitrc_PROGRAMS)
+privileged_startx$(EXEEXT): $(privileged_startx_OBJECTS) $(privileged_startx_DEPENDENCIES)
+ @rm -f privileged_startx$(EXEEXT)
+ $(LINK) $(privileged_startx_OBJECTS) $(privileged_startx_LDADD) $(LIBS)
+install-privstartxSCRIPTS: $(privstartx_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(privstartxdir)" || $(MKDIR_P) "$(DESTDIR)$(privstartxdir)"
+ @list='$(privstartx_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(privstartxSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(privstartxdir)/$$f'"; \
+ $(privstartxSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(privstartxdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-privstartxSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(privstartx_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(privstartxdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(privstartxdir)/$$f"; \
+ done
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privileged_startx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privileged_startxServer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privileged_startxUser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
+
+.c.o:
+@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@ $(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) '$<'`
+install-launchdaemonsDATA: $(launchdaemons_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(launchdaemonsdir)" || $(MKDIR_P) "$(DESTDIR)$(launchdaemonsdir)"
+ @list='$(launchdaemons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(launchdaemonsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(launchdaemonsdir)/$$f'"; \
+ $(launchdaemonsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(launchdaemonsdir)/$$f"; \
+ done
+
+uninstall-launchdaemonsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(launchdaemons_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(launchdaemonsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(launchdaemonsdir)/$$f"; \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(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; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(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; 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) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ list='$(SOURCES) $(HEADERS) $(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; 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
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @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; \
+ 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; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(xinitrcdir)" "$(DESTDIR)$(privstartxdir)" "$(DESTDIR)$(launchdaemonsdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-xinitrcPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-launchdaemonsDATA install-privstartxSCRIPTS \
+ install-xinitrcPROGRAMS
+
+install-dvi: install-dvi-am
+
+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
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-launchdaemonsDATA uninstall-privstartxSCRIPTS \
+ uninstall-xinitrcPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-xinitrcPROGRAMS ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-launchdaemonsDATA install-man \
+ install-pdf install-pdf-am install-privstartxSCRIPTS \
+ install-ps install-ps-am install-strip install-xinitrcPROGRAMS \
+ 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-launchdaemonsDATA \
+ uninstall-privstartxSCRIPTS uninstall-xinitrcPROGRAMS
+
+
+.cpp:
+ $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
+.man.$(APP_MAN_SUFFIX):
+ $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+
+10-tmpdirs: 10-tmpdirs.cpp Makefile
+20-font_cache: 20-font_cache.cpp Makefile
+
+$(BUILT_SOURCES): privileged_startx.defs
+ mig -sheader privileged_startxServer.h privileged_startx.defs
+# 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:
commit e8ce37fafd3ad380b77e28fc923e7c020268abca
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed May 21 23:22:46 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 0868ca3..3f42820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,142 @@
+commit 3c5e2ed686bd3ab39e2c1e87feffb5990603cf3c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:34:52 2008 -0400
+
+ xinit 1.0.9
+
+commit c07501f69239e9c1448736ad7e689a2c3da49af9
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:29:55 2008 -0400
+
+ Unset session environment variables so startx works within a running session.
+
+commit ef2610f44c7cf40489203fddc77ddcdfb7764eed
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue May 13 16:28:33 2008 -0700
+
+ Use /bin/ksh instead of /bin/sh on Solaris
+
+commit d3bc7001315a8ba13be073af86fe710740b2d4c3
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue May 13 16:25:49 2008 -0700
+
+ Check for proper cookie creation on all platforms
+
+commit ef7abe2e72074f8252f0812ab2ca05dff7e76a38
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue May 13 16:25:22 2008 -0700
+
+ Use od on /dev/random to generate cookie on Solaris
+
+commit e0e89545db1fc08ffe49b2b24455bb30137da671
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon May 12 13:17:46 2008 -0700
+
+ Apple: Don't need to spew unneccessary 'directory exists' messages.
+
+commit 85561f8347b33422dd4b0ea11911347c0666e409
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue May 6 00:07:18 2008 -0700
+
+ Apple: No need for these bits being here in xinit as of xserver-1.4.0-apple9
+
+commit 280774466dc9f57b4b46c618345f7938290dbb2c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Fri Apr 25 19:00:23 2008 -0700
+
+ Apple: Added some OSX version protection, so this will still compile on Tiger and below.
+
+commit 0806ae2ecfdcb4ad5f3b7a66dcc9bc5d29d72649
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Fri Apr 25 15:12:54 2008 -0700
+
+ Apple: Use CFProcessPath instead of argv[0] trick.
+
+commit edc3112679af749f0c6fc54b2eec1b89aaf0d0c8
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Apr 20 17:30:14 2008 +0200
+
+ Replace sprintf() and strcpy() with snprintf().
+
+commit 47d561fd6efb8923cfbace6fea40dfeb314b4662
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sat Apr 19 08:50:45 2008 -0700
+
+ Cleaned up handling of defaultserver{,args}
+ Per comments from Jeremy Reed on the list... basically doing for everyone what I do for Apple
+
+commit f6e75ebf5f7f245e1cdeb883a1d2db74f2451fd4
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sat Apr 19 08:47:20 2008 -0700
+
+ Apple: Fixed make dist to include a missing header and not include generated sources
+
+commit 2b06b58a328e13df4704df8a48d4cd0b1100ba7e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Apr 17 17:19:41 2008 -0700
+
+ Apple: Added privileged_startx
+
+commit fe5af014f2645d1ecf981d40d3c10a3621e9ec56
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon Apr 14 13:05:26 2008 -0700
+
+ Apple: Wait for privileged_startx to finish, so we don't race to create /tmp/.X11-unix
+
+commit d5590dba3cce39367762d39822094ca51000142b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sun Apr 13 23:15:27 2008 -0700
+
+ Apple: We renamed font_cache.sh to font_cache for better consistency... Changing startx to work with this
+
+commit 5ef443bb6bff0a03ee00105d9bf95bc3f6f82b11
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sun Apr 13 19:51:18 2008 -0700
+
+ Apple: privileged_startx is in XINITDIR
+
+commit c1b70ca67ecd12d6837584e7ef4abd01ee3b7ad9
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Apr 8 17:25:54 2008 -0700
+
+ Correctly handle users with spaces in $HOME
+
+commit 1cb4bb208d481967fb736acf10c6ac2b66bf3181
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sat Apr 5 17:23:02 2008 -0700
+
+ Apple: Renamed LaunchAgent to org.x.startx to distinguish it from the org.x.X11 application
+
+commit f7c706ff46d4a2364d65731cd1c3135ef7987380
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Fri Apr 4 22:49:51 2008 -0700
+
+ Apple: Execute /usr/X11/bin/privileged_startx if it's present
+
+commit ca08a36d10f15be6d230a9af92288da4cb24cd43
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Fri Apr 4 02:31:10 2008 -0700
+
+ Apple: Fixed issue where display would not be passed correctly to the server if nolisten tcp was enabled.
+
+commit 8c52bd4509b7fe5a74026b5bc638d59add9e8945
+Author: Jeremy C. Reed <reed@tx.reedmedia.net>
+Date: Sat Mar 15 18:23:45 2008 -0500
+
+ Use /dev/urandom for cookie it it exists
+ else fall back to /dev/random.
+ Not doing in configure.ac because can't easily check for
+ existence when doing cross-builds.
+ (Alternative would be to define this for every operating system
+ in configure.ac. Currently only is defined for OpenBSD.
+ Systems that have mcookie also will not be effected.)
+
+commit 062524614fdd4f11f32ba3d054f7fc16b9bc5f12
+Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
+Date: Sat Mar 8 19:02:05 2008 +0100
+
+ OpenBSD: use openssl rand -hex 16 to generate the cookie.
+
commit 3eaee22196a03d88c419c42470baf562552c1a3b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 17:09:45 2008 -0500
diff --git a/Makefile.in b/Makefile.in
index d1abbd2..889cf4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,6 +100,13 @@ CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(xinit_SOURCES)
DIST_SOURCES = $(xinit_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -110,6 +117,8 @@ appmanDATA_INSTALL = $(INSTALL_DATA)
launchagentsDATA_INSTALL = $(INSTALL_DATA)
xinitrcDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appman_DATA) $(launchagents_DATA) $(xinitrc_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -230,6 +239,7 @@ includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
launchagentsdir = @launchagentsdir@
+launchdaemonsdir = @launchdaemonsdir@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -252,7 +262,7 @@ XINITDIR = $(libdir)/X11/xinit
bin_SCRIPTS = startx
xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
xinit_LDADD = $(XINIT_LIBS)
-@APPLE_TRUE@xinit_LDFLAGS = -framework CoreServices
+@APPLE_LEOPARD_TRUE@xinit_LDFLAGS = -framework CoreServices
xinit_SOURCES = \
xinit.c
@@ -303,15 +313,17 @@ CPP_FILES_FLAGS = \
-D__libexecdir__="$(libexecdir)" \
-D__bindir__="$(bindir)"
-@LAUNCHD_TRUE@launchagents_PRE = org.x.X11.plist.pre
-@LAUNCHD_TRUE@launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
+@LAUNCHD_TRUE@launchagents_PRE = org.x.startx.plist.cpp
+@LAUNCHD_TRUE@launchagents_DATA = $(launchagents_PRE:plist.cpp=plist)
+@LAUNCHD_TRUE@SUBDIRS = privileged_startx
+DIST_SUBDIRS = privileged_startx
xinitrc_DATA = xinitrc
CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA)
-EXTRA_DIST = xinitrc.cpp startx.cpp org.x.X11.plist.cpp $(appman_PRE) \
+EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \
startx.cmd xinitrc.cmd xinit.def ChangeLog autogen.sh
all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
.SUFFIXES: .$(APP_MAN_SUFFIX) .man .cpp .c .o .obj
@@ -498,6 +510,76 @@ uninstall-xinitrcDATA:
rm -f "$(DESTDIR)$(xinitrcdir)/$$f"; \
done
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -508,10 +590,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
Reply to: