diff options
| -rw-r--r-- | app/xrdb/Makefile.in | 22 | ||||
| -rw-r--r-- | app/xrdb/compile | 142 | ||||
| -rw-r--r-- | app/xrdb/configure | 20 |
3 files changed, 14 insertions, 170 deletions
diff --git a/app/xrdb/Makefile.in b/app/xrdb/Makefile.in index 0c55ea111..9558e126d 100644 --- a/app/xrdb/Makefile.in +++ b/app/xrdb/Makefile.in @@ -62,7 +62,7 @@ bin_PROGRAMS = xrdb$(EXEEXT) 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 + config.guess config.sub depcomp install-sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -76,7 +76,7 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_xrdb_OBJECTS = xrdb-xrdb.$(OBJEXT) +am_xrdb_OBJECTS = xrdb.$(OBJEXT) xrdb_OBJECTS = $(am_xrdb_OBJECTS) am__DEPENDENCIES_1 = xrdb_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -209,7 +209,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -xrdb_CFLAGS = $(XRDB_CFLAGS) +AM_CFLAGS = $(XRDB_CFLAGS) xrdb_LDADD = $(XRDB_LIBS) xrdb_SOURCES = \ xrdb.c @@ -329,7 +329,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrdb-xrdb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrdb.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -344,20 +344,6 @@ distclean-compile: @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) '$<'` - -xrdb-xrdb.o: xrdb.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xrdb_CFLAGS) $(CFLAGS) -MT xrdb-xrdb.o -MD -MP -MF "$(DEPDIR)/xrdb-xrdb.Tpo" -c -o xrdb-xrdb.o `test -f 'xrdb.c' || echo '$(srcdir)/'`xrdb.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xrdb-xrdb.Tpo" "$(DEPDIR)/xrdb-xrdb.Po"; else rm -f "$(DEPDIR)/xrdb-xrdb.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xrdb.c' object='xrdb-xrdb.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) $(xrdb_CFLAGS) $(CFLAGS) -c -o xrdb-xrdb.o `test -f 'xrdb.c' || echo '$(srcdir)/'`xrdb.c - -xrdb-xrdb.obj: xrdb.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xrdb_CFLAGS) $(CFLAGS) -MT xrdb-xrdb.obj -MD -MP -MF "$(DEPDIR)/xrdb-xrdb.Tpo" -c -o xrdb-xrdb.obj `if test -f 'xrdb.c'; then $(CYGPATH_W) 'xrdb.c'; else $(CYGPATH_W) '$(srcdir)/xrdb.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xrdb-xrdb.Tpo" "$(DEPDIR)/xrdb-xrdb.Po"; else rm -f "$(DEPDIR)/xrdb-xrdb.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xrdb.c' object='xrdb-xrdb.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) $(xrdb_CFLAGS) $(CFLAGS) -c -o xrdb-xrdb.obj `if test -f 'xrdb.c'; then $(CYGPATH_W) 'xrdb.c'; else $(CYGPATH_W) '$(srcdir)/xrdb.c'; fi` uninstall-info-am: install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) diff --git a/app/xrdb/compile b/app/xrdb/compile deleted file mode 100644 index 1b1d23216..000000000 --- a/app/xrdb/compile +++ /dev/null @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/app/xrdb/configure b/app/xrdb/configure index 65a354df9..972ab0194 100644 --- a/app/xrdb/configure +++ b/app/xrdb/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xrdb 1.0.3. +# Generated by GNU Autoconf 2.59 for xrdb 1.0.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xrdb' PACKAGE_TARNAME='xrdb' -PACKAGE_VERSION='1.0.3' -PACKAGE_STRING='xrdb 1.0.3' +PACKAGE_VERSION='1.0.4' +PACKAGE_STRING='xrdb 1.0.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -791,7 +791,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xrdb 1.0.3 to adapt to many kinds of systems. +\`configure' configures xrdb 1.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -857,7 +857,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xrdb 1.0.3:";; + short | recursive ) echo "Configuration of xrdb 1.0.4:";; esac cat <<\_ACEOF @@ -987,7 +987,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xrdb configure 1.0.3 +xrdb configure 1.0.4 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1001,7 +1001,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xrdb $as_me 1.0.3, which was +It was created by xrdb $as_me 1.0.4, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1644,7 +1644,7 @@ fi # Define the identity of the package. PACKAGE='xrdb' - VERSION='1.0.3' + VERSION='1.0.4' cat >>confdefs.h <<_ACEOF @@ -4579,7 +4579,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xrdb $as_me 1.0.3, which was +This file was extended by xrdb $as_me 1.0.4, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4642,7 +4642,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xrdb config.status 1.0.3 +xrdb config.status 1.0.4 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |