debian/changelog | 19 debian/compat | 2 debian/control | 5 debian/patches/04_xutils-dev-debian.diff | 27 debian/patches/05_xaw_without_xp.diff | 18 debian/patches/Replace-fprintf-with-fputs.patch | 31 debian/patches/series | 1 debian/rules | 26 debian/versions | 12 imake/ChangeLog | 84 imake/Makefile.in | 352 - imake/aclocal.m4 | 796 +-- imake/compile | 347 + imake/config.guess | 407 - imake/config.sub | 237 imake/configure | 2723 +++++----- imake/configure.ac | 9 imake/depcomp | 531 +- imake/imake.c | 22 imake/imake.man | 108 imake/imakemdep.h | 24 imake/install-sh | 35 imake/missing | 461 - makedepend/ChangeLog | 221 makedepend/Makefile.am | 3 makedepend/Makefile.in | 760 ++ makedepend/aclocal.m4 | 774 +- makedepend/autogen.sh | 4 makedepend/compile | 347 + makedepend/config.guess | 407 - makedepend/config.sub | 237 makedepend/configure | 2880 +++++----- makedepend/configure.ac | 18 makedepend/cppsetup.c | 2 makedepend/def.h | 7 makedepend/depcomp | 531 +- makedepend/imakemdep.h | 6 makedepend/include.c | 14 makedepend/install-sh | 35 makedepend/main.c | 127 makedepend/makedepend-config.h.in | 3 makedepend/missing | 461 - makedepend/parse.c | 13 makedepend/pr.c | 4 makedepend/test-driver | 127 util-macros/ChangeLog | 71 util-macros/Makefile.in | 245 util-macros/README | 2 util-macros/aclocal.m4 | 604 +- util-macros/configure | 236 util-macros/configure.ac | 3 util-macros/install-sh | 35 util-macros/missing | 461 - util-macros/xorg-macros.m4.in | 12 util-macros/xorgversion.m4 | 2 xorg-cf-files/Amoeba.cf | 4 xorg-cf-files/ChangeLog | 73 xorg-cf-files/DGUX.cf | 6 xorg-cf-files/FreeBSD.cf | 36 xorg-cf-files/Imake.cf | 28 xorg-cf-files/Makefile.am | 3 xorg-cf-files/Makefile.in | 220 xorg-cf-files/Mips.cf | 2 xorg-cf-files/Motif.rules | 8 xorg-cf-files/Motif.tmpl | 14 xorg-cf-files/NetBSD.cf | 32 xorg-cf-files/OpenBSD.cf | 42 xorg-cf-files/OpenBSDLib.tmpl | 4 xorg-cf-files/QNX4.cf | 8 xorg-cf-files/QNX4.rules | 4 xorg-cf-files/Server.tmpl | 2 xorg-cf-files/Threads.tmpl | 2 xorg-cf-files/Win32.cf | 4 xorg-cf-files/X11.rules | 10 xorg-cf-files/X11.tmpl | 20 xorg-cf-files/aclocal.m4 | 2039 +++++-- xorg-cf-files/bsdLib.rules | 4 xorg-cf-files/cde.rules | 6 xorg-cf-files/compile | 347 + xorg-cf-files/config.guess | 407 - xorg-cf-files/config.sub | 237 xorg-cf-files/configure | 6294 +++++++++++++++++++++++- xorg-cf-files/configure.ac | 2 xorg-cf-files/convex.cf | 6 xorg-cf-files/cross.def | 2 xorg-cf-files/cygwin.cf | 22 xorg-cf-files/cygwin.rules | 6 xorg-cf-files/cygwin.tmpl | 6 xorg-cf-files/darwin.cf | 2 xorg-cf-files/dmx.cf | 2 xorg-cf-files/fujitsu.cf | 2 xorg-cf-files/hp.cf | 12 xorg-cf-files/ibm.cf | 2 xorg-cf-files/ibmLib.rules | 2 xorg-cf-files/ibmLib.tmpl | 4 xorg-cf-files/install-sh | 35 xorg-cf-files/isc.cf | 16 xorg-cf-files/linux.cf | 17 xorg-cf-files/lnxdoc.tmpl | 2 xorg-cf-files/luna.cf | 10 xorg-cf-files/lynx.cf | 10 xorg-cf-files/mingw.cf | 30 xorg-cf-files/mingw.rules | 6 xorg-cf-files/mingw.tmpl | 6 xorg-cf-files/minix.cf | 2 xorg-cf-files/missing | 461 - xorg-cf-files/ncr.cf | 2 xorg-cf-files/nto.cf | 18 xorg-cf-files/nto.rules | 6 xorg-cf-files/oldlib.rules | 2 xorg-cf-files/os2.cf | 8 xorg-cf-files/os2Lib.tmpl | 32 xorg-cf-files/os2def.db | 1228 ++-- xorg-cf-files/osf1.cf | 20 xorg-cf-files/osfLib.rules | 2 xorg-cf-files/pegasus.cf | 2 xorg-cf-files/sco.cf | 6 xorg-cf-files/sco5.cf | 10 xorg-cf-files/scoLib.rules | 2 xorg-cf-files/sequent.cf | 24 xorg-cf-files/sequentLib.rules | 4 xorg-cf-files/sun.cf | 101 xorg-cf-files/sv3Lib.rules | 4 xorg-cf-files/sv4Lib.rules | 2 xorg-cf-files/svr3.cf | 4 xorg-cf-files/usl.cf | 10 xorg-cf-files/xf86.rules | 2 xorg-cf-files/xf86.tmpl | 2 xorg-cf-files/xf86site.def | 22 xorg-cf-files/xfree86.cf | 18 xorg-cf-files/xorg.cf | 16 xorg-cf-files/xorg.tmpl | 2 xorg-cf-files/xorgsite.def | 36 xorg-cf-files/xorgversion.def | 4 xorg-cf-files/xprint_host.def | 305 - 135 files changed, 18640 insertions(+), 8704 deletions(-)
New commits: commit e459d6dae36e63d9395fd0d441ba892257db07e1 Author: Julien Cristau <[email protected]> Date: Mon Sep 9 20:23:32 2013 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index a141d55..20d5b3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xutils-dev (1:7.7+1) UNRELEASED; urgency=low +xutils-dev (1:7.7+1) unstable; urgency=low * xorg-cf-files: Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man for manpages (closes: #638016). Thanks, Svante Signell. @@ -16,7 +16,7 @@ xutils-dev (1:7.7+1) UNRELEASED; urgency=low * Force RAWCPP to cpp-4.7 since 4.8 seems to break stuff (adds 40 blank lines before the #!). - -- Julien Cristau <[email protected]> Mon, 28 May 2012 12:05:05 +0200 + -- Julien Cristau <[email protected]> Mon, 09 Sep 2013 20:23:08 +0200 xutils-dev (1:7.7~1) unstable; urgency=low commit 8024da53072c5d794127acb4a8bf86d6dfe6da12 Author: Julien Cristau <[email protected]> Date: Mon Sep 9 20:20:51 2013 +0200 Force RAWCPP to cpp-4.7 since 4.8 seems to break stuff It adds 40 blank lines before the #! diff --git a/debian/changelog b/debian/changelog index f0fa466..a141d55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xutils-dev (1:7.7~2) UNRELEASED; urgency=low +xutils-dev (1:7.7+1) UNRELEASED; urgency=low * xorg-cf-files: Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man for manpages (closes: #638016). Thanks, Svante Signell. @@ -13,6 +13,8 @@ xutils-dev (1:7.7~2) UNRELEASED; urgency=low * Make imake build with -Werror=format-security. * util-macros 1.17.1. * Disable silent build rules. + * Force RAWCPP to cpp-4.7 since 4.8 seems to break stuff (adds 40 blank lines + before the #!). -- Julien Cristau <[email protected]> Mon, 28 May 2012 12:05:05 +0200 diff --git a/debian/control b/debian/control index 0a33289..6c4e819 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: quilt, x11proto-core-dev (>= 7.0.17), autoconf, + cpp-4.7, Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git diff --git a/debian/rules b/debian/rules index 75ae65a..1b59582 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch $(STAMP_DIR)/autotools-dev --disable-silent-rules \ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) cd $*-build && \ - $(MAKE) + $(MAKE) RAWCPP=/usr/bin/cpp-4.7 # Possible "make check": if echo $(SUBDIRS_CHECK) | grep -qs "\<$*\>"; then \ cd $*-build && \ commit c28e2ec2d9b8977b792b72d792f9471b51463876 Author: Julien Cristau <[email protected]> Date: Mon Sep 9 20:03:45 2013 +0200 Disable silent build rules. diff --git a/debian/changelog b/debian/changelog index 1889eb0..f0fa466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xutils-dev (1:7.7~2) UNRELEASED; urgency=low * Use dpkg-buildflags. * Make imake build with -Werror=format-security. * util-macros 1.17.1. + * Disable silent build rules. -- Julien Cristau <[email protected]> Mon, 28 May 2012 12:05:05 +0200 diff --git a/debian/rules b/debian/rules index 1e5c86e..75ae65a 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch $(STAMP_DIR)/autotools-dev cd $*-build && \ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ + --disable-silent-rules \ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) cd $*-build && \ $(MAKE) commit 4b8c2c1f4e84f8cf000dba56cfee867d3b7719ab Author: Julien Cristau <[email protected]> Date: Mon Sep 9 20:03:03 2013 +0200 Update debian/versions diff --git a/debian/versions b/debian/versions index 619f4df..98d3a9f 100644 --- a/debian/versions +++ b/debian/versions @@ -9,7 +9,8 @@ squeeze. As the most useful, util-macros comes first. util-macros | Debian ------------------------ -1.17.0 | 1:7.6+7 +1.17.1 | 1:7.7+1 +1.17.0 | 1:7.7~1 1.15.0 | 1:7.6+5 1.14.0 | 1:7.6+4 1.13.0 | 1:7.6+3 @@ -25,23 +26,26 @@ gccmakedep | Debian imake | Debian ------------------------ -1.0.5 | 1:7.6+7 +1.0.6 | 1:7.7+1 +1.0.5 | 1:7.7~1 1.0.4 | 1:7.5+5 lndir | Debian ------------------------ -1.0.3 | 1:7.6+7 +1.0.3 | 1:7.7~1 1.0.2 | 1:7.5+5 makedepend | Debian ------------------------ -1.0.4 | 1:7.6+7 +1.0.5 | 1:7.7+1 +1.0.4 | 1:7.7~1 1.0.3 | 1:7.5+5 1.0.2 | 1:7.5+4 xorg-cf-files | Debian ------------------------ +1.0.5 | 1:7.7+1 1.0.4 | 1:7.6+1 1.0.3 | 1:7.5+4 commit d5e8d35a70e86099d3d59e4b764c4f3459c0bab6 Author: Julien Cristau <[email protected]> Date: Mon Sep 9 19:50:06 2013 +0200 util-macros 1.17.1. diff --git a/debian/changelog b/debian/changelog index 0790262..1889eb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ xutils-dev (1:7.7~2) UNRELEASED; urgency=low * Replace dh_clean -k with dh_prep. * Use dpkg-buildflags. * Make imake build with -Werror=format-security. + * util-macros 1.17.1. -- Julien Cristau <[email protected]> Mon, 28 May 2012 12:05:05 +0200 diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index b55ec7a..600f7b2 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,74 @@ +commit 052fa1dc1779de34ba69f68b7dc32b3c733c823e +Author: Alan Coopersmith <[email protected]> +Date: Fri Sep 6 23:34:33 2013 -0700 + + Version bump: 1.17.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e6a41a0c6a84b34c6dc173a0a41089d0ebaddac0 +Author: Alan Coopersmith <[email protected]> +Date: Fri Sep 6 23:30:00 2013 -0700 + + Strip trailing whitespace + + sed -i 's/[[:space:]]*$//' * + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3683c2b2d0b5e7d57374860147ca827da596bad5 +Author: Chris Wilson <[email protected]> +Date: Mon Aug 5 16:00:20 2013 +0100 + + Use the right variable names for the compiler flags in XORG_TESTSET_CFLAG + + Whilst populating the xorg_cv_ cache entries, and the subsequent + xorg_testset_, we always include the FLAG_PREFIX in the name, to + distinguish between C and C++ iterations. However, in the body of the + test function, we dropped the FLAG_PREFIX expansion and so always used + the empty string and hence did not correctly detect incorrect flags. + + The bug was introduced with + commit 51f69514e65637f575df901ef942515e70314f6a + Author: Chase Douglas <[email protected]> + Date: Mon Mar 12 11:49:28 2012 -0700 + + Separate unknown warning options by language + + Reported-and-tested-by: Sedat Dilek <[email protected]> + Signed-off-by: Chris Wilson <[email protected]> + Cc: Sedat Dilek <[email protected]> + Cc: Chase Douglas <[email protected]> + Cc: Gaetan Nadon<[email protected]> + Acked-by: Alan Coopersmith <[email protected]> + +commit c98b41de5596c675c603ef43ae9570133f1a9921 +Author: Colin Walters <[email protected]> +Date: Wed Jan 4 17:37:06 2012 -0500 + + autogen.sh: Implement GNOME Build API + + http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Adam Jackson <[email protected]> + +commit bd25ef721dff995096efffef4dcc9275cea43d4f +Author: Adam Jackson <[email protected]> +Date: Tue Jan 15 13:44:31 2013 -0500 + + configure: Remove AM_MAINTAINER_MODE + + Signed-off-by: Adam Jackson <[email protected]> + +commit 0890e4003aacfa7113ab3f4e3ad7c5636f8e922a +Author: Yaakov Selkowitz <[email protected]> +Date: Tue Apr 3 18:43:02 2012 -0500 + + Fix spacing in XORG_TESTSET_CFLAG + + Signed-off-by: Yaakov Selkowitz <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + commit c0c42057e0d357c144e7933ee413b522950a0f17 Author: Gaetan Nadon <[email protected]> Date: Tue Mar 13 19:45:12 2012 -0400 diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in index f326d01..6feb24a 100644 --- a/util-macros/Makefile.in +++ b/util-macros/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 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. @@ -37,6 +36,51 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,11 +98,11 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/xorg-macros.m4.in $(srcdir)/xorg-macros.pc.in \ - $(srcdir)/xorgversion.m4 $(top_srcdir)/configure COPYING \ - ChangeLog INSTALL install-sh missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/xorg-macros.pc.in $(srcdir)/xorg-macros.m4.in \ + $(srcdir)/xorgversion.m4 $(dist_pkgdata_DATA) COPYING \ + ChangeLog INSTALL README install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/xorgversion.m4 \ $(top_srcdir)/configure.ac @@ -69,8 +113,25 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = xorg-macros.pc xorg-macros.m4 CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -92,22 +153,36 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(pkgdatadir)" \ "$(DESTDIR)$(pkgconfigdir)" DATA = $(aclocal_DATA) $(dist_pkgdata_DATA) $(pkgconfig_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) 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)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -126,7 +201,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ @@ -188,9 +262,9 @@ pkgconfig_DATA = xorg-macros.pc all: all-am .SUFFIXES: -am--refresh: +am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -217,9 +291,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): xorg-macros.pc: $(top_builddir)/config.status $(srcdir)/xorg-macros.pc.in @@ -228,8 +302,11 @@ xorg-macros.m4: $(top_builddir)/config.status $(srcdir)/xorg-macros.m4.in $(srcd cd $(top_builddir) && $(SHELL) ./config.status $@ install-aclocalDATA: $(aclocal_DATA) @$(NORMAL_INSTALL) - test -z "$(aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" @list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -243,13 +320,14 @@ uninstall-aclocalDATA: @$(NORMAL_UNINSTALL) @list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(aclocaldir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(aclocaldir)" && rm -f $$files + dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir) install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -263,13 +341,14 @@ uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files + dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -283,14 +362,12 @@ uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files -tags: TAGS -TAGS: + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -337,36 +414,41 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -377,8 +459,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -388,9 +470,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -398,6 +480,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -421,13 +504,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -460,10 +551,15 @@ install-am: all-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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -549,20 +645,21 @@ uninstall-am: uninstall-aclocalDATA uninstall-dist_pkgdataDATA \ .MAKE: install-am install-data-am install-strip -.PHONY: all all-am am--refresh check check-am clean clean-generic dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distcleancheck distdir distuninstallcheck \ - dvi dvi-am html html-am info info-am install \ - install-aclocalDATA install-am install-data install-data-am \ - install-data-hook install-dist_pkgdataDATA 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-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-aclocalDATA uninstall-am uninstall-dist_pkgdataDATA \ +.PHONY: all all-am am--refresh check check-am clean clean-generic \ + cscopelist-am ctags-am dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-aclocalDATA install-am install-data \ + install-data-am install-data-hook install-dist_pkgdataDATA \ + 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-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-aclocalDATA \ + uninstall-am uninstall-dist_pkgdataDATA \ uninstall-pkgconfigDATA diff --git a/util-macros/README b/util-macros/README index 3d7e08b..290ef95 100644 --- a/util-macros/README +++ b/util-macros/README @@ -14,7 +14,7 @@ Xorg mailing list: The master development code repository can be found at: git://anongit.freedesktop.org/git/xorg/util/macros - + http://cgit.freedesktop.org/xorg/util/macros/ For more information on the git code manager, see: diff --git a/util-macros/aclocal.m4 b/util-macros/aclocal.m4 index fced0e9..4d621c1 100644 --- a/util-macros/aclocal.m4 +++ b/util-macros/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 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,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, [m4_warning([this file was generated for autoconf 2.68. 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'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -108,56 +109,23 @@ AC_PREREQ([2.50])dnl am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 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. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -170,7 +138,7 @@ fi])]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -199,31 +167,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
