regen
This commit is contained in:
parent
6f989b3332
commit
dd2a82322e
@ -14,9 +14,6 @@
|
|||||||
|
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
|
|
||||||
#
|
|
||||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:01:50 matthieu Exp $
|
|
||||||
#
|
|
||||||
# Copyright © 2003 Keith Packard, Noah Levitt
|
# Copyright © 2003 Keith Packard, Noah Levitt
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||||
@ -235,7 +232,8 @@ SUBDIRS = util src include man
|
|||||||
AM_CFLAGS = $(XT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 -I$(top_builddir)/include/X11
|
AM_CFLAGS = $(XT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 -I$(top_builddir)/include/X11
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = xt.pc
|
pkgconfig_DATA = xt.pc
|
||||||
EXTRA_DIST = xt.pc.in autogen.sh
|
EXTRA_DIST = xt.pc.in ChangeLog autogen.sh
|
||||||
|
MAINTAINERCLEANFILES = ChangeLog
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||||
|
|
||||||
@ -497,6 +495,9 @@ distdir: $(DISTFILES)
|
|||||||
|| exit 1; \
|
|| exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) \
|
||||||
|
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||||
|
dist-hook
|
||||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
-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 -444 -links 1 -exec chmod a+r {} \; -o \
|
||||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||||
@ -626,6 +627,7 @@ distclean-generic:
|
|||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
@echo "This command is intended for maintainers to use"
|
@echo "This command is intended for maintainers to use"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||||
clean: clean-recursive
|
clean: clean-recursive
|
||||||
|
|
||||||
clean-am: clean-generic clean-libtool mostlyclean-am
|
clean-am: clean-generic clean-libtool mostlyclean-am
|
||||||
@ -681,7 +683,7 @@ uninstall-info: uninstall-info-recursive
|
|||||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
||||||
check-am clean clean-generic clean-libtool clean-recursive \
|
check-am clean clean-generic clean-libtool clean-recursive \
|
||||||
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
||||||
dist-shar dist-tarZ dist-zip distcheck distclean \
|
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||||
distclean-generic distclean-hdr distclean-libtool \
|
distclean-generic distclean-hdr distclean-libtool \
|
||||||
distclean-recursive distclean-tags distcleancheck distdir \
|
distclean-recursive distclean-tags distcleancheck distdir \
|
||||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||||
@ -695,6 +697,11 @@ uninstall-info: uninstall-info-recursive
|
|||||||
uninstall uninstall-am uninstall-info-am \
|
uninstall uninstall-am uninstall-info-am \
|
||||||
uninstall-pkgconfigDATA
|
uninstall-pkgconfigDATA
|
||||||
|
|
||||||
|
|
||||||
|
ChangeLog:
|
||||||
|
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||||
|
|
||||||
|
dist-hook: ChangeLog
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
22
lib/libXt/aclocal.m4
vendored
22
lib/libXt/aclocal.m4
vendored
@ -7445,7 +7445,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
|
|||||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
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/\..*$//'`]
|
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}])
|
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.2
|
[XORG_MACROS_version=1.1.5
|
||||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e '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
|
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||||
@ -7849,7 +7849,8 @@ dnl
|
|||||||
# --------------------
|
# --------------------
|
||||||
# Adds --with/without-release-string and changes the PACKAGE and
|
# Adds --with/without-release-string and changes the PACKAGE and
|
||||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
|
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||||
|
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||||
|
|
||||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||||
AC_ARG_WITH(release-version,
|
AC_ARG_WITH(release-version,
|
||||||
@ -7862,6 +7863,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
|||||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||||
fi
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||||
|
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||||
|
[Major version of this package])
|
||||||
|
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||||
|
if test "x$PVM" = "x"; then
|
||||||
|
PVM="0"
|
||||||
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||||
|
[$PVM],
|
||||||
|
[Minor version of this package])
|
||||||
|
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||||
|
if test "x$PVP" = "x"; then
|
||||||
|
PVP="0"
|
||||||
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||||
|
[$PVP],
|
||||||
|
[Patch version of this package])
|
||||||
])
|
])
|
||||||
|
|
||||||
m4_include([acinclude.m4])
|
m4_include([acinclude.m4])
|
||||||
|
43
lib/libXt/configure
vendored
43
lib/libXt/configure
vendored
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.59 for libXt 1.0.4.
|
# Generated by GNU Autoconf 2.59 for libXt 1.0.5.
|
||||||
#
|
#
|
||||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||||
#
|
#
|
||||||
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='libXt'
|
PACKAGE_NAME='libXt'
|
||||||
PACKAGE_TARNAME='libXt'
|
PACKAGE_TARNAME='libXt'
|
||||||
PACKAGE_VERSION='1.0.4'
|
PACKAGE_VERSION='1.0.5'
|
||||||
PACKAGE_STRING='libXt 1.0.4'
|
PACKAGE_STRING='libXt 1.0.5'
|
||||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||||
|
|
||||||
# Factoring default headers for most tests.
|
# Factoring default headers for most tests.
|
||||||
@ -965,7 +965,7 @@ if test "$ac_init_help" = "long"; then
|
|||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# 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.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures libXt 1.0.4 to adapt to many kinds of systems.
|
\`configure' configures libXt 1.0.5 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -1031,7 +1031,7 @@ fi
|
|||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of libXt 1.0.4:";;
|
short | recursive ) echo "Configuration of libXt 1.0.5:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -1187,7 +1187,7 @@ fi
|
|||||||
test -n "$ac_init_help" && exit 0
|
test -n "$ac_init_help" && exit 0
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
libXt configure 1.0.4
|
libXt configure 1.0.5
|
||||||
generated by GNU Autoconf 2.59
|
generated by GNU Autoconf 2.59
|
||||||
|
|
||||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||||
@ -1201,7 +1201,7 @@ cat >&5 <<_ACEOF
|
|||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by libXt $as_me 1.0.4, which was
|
It was created by libXt $as_me 1.0.5, which was
|
||||||
generated by GNU Autoconf 2.59. Invocation command line was
|
generated by GNU Autoconf 2.59. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -1844,7 +1844,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='libXt'
|
PACKAGE='libXt'
|
||||||
VERSION='1.0.4'
|
VERSION='1.0.5'
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
@ -19451,6 +19451,29 @@ fi;
|
|||||||
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||||
|
if test "x$PVM" = "x"; then
|
||||||
|
PVM="0"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define PACKAGE_VERSION_MINOR $PVM
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||||
|
if test "x$PVP" = "x"; then
|
||||||
|
PVP="0"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define PACKAGE_VERSION_PATCHLEVEL $PVP
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile src/Makefile util/Makefile include/Makefile man/Makefile xt.pc"
|
ac_config_files="$ac_config_files Makefile src/Makefile util/Makefile include/Makefile man/Makefile xt.pc"
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
@ -19850,7 +19873,7 @@ _ASBOX
|
|||||||
} >&5
|
} >&5
|
||||||
cat >&5 <<_CSEOF
|
cat >&5 <<_CSEOF
|
||||||
|
|
||||||
This file was extended by libXt $as_me 1.0.4, which was
|
This file was extended by libXt $as_me 1.0.5, which was
|
||||||
generated by GNU Autoconf 2.59. Invocation command line was
|
generated by GNU Autoconf 2.59. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -19913,7 +19936,7 @@ _ACEOF
|
|||||||
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF
|
cat >>$CONFIG_STATUS <<_ACEOF
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
libXt config.status 1.0.4
|
libXt config.status 1.0.5
|
||||||
configured by $0, generated by GNU Autoconf 2.59,
|
configured by $0, generated by GNU Autoconf 2.59,
|
||||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||||
|
|
||||||
|
@ -634,10 +634,10 @@ $(BUILT_HEADER): $(BUILT_SOURCE)
|
|||||||
|
|
||||||
$(BUILT_SOURCE):
|
$(BUILT_SOURCE):
|
||||||
$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
|
$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
|
||||||
$(INSTALL) -d $(top_builddir)/src
|
mkdir -p $(top_builddir)/src
|
||||||
$(INSTALL) -d $(top_builddir)/include/X11
|
mkdir -p $(top_builddir)/include/X11
|
||||||
$(install_sh_DATA) StringDefs.h $(top_builddir)/include/X11
|
cp StringDefs.h $(top_builddir)/include/X11
|
||||||
$(install_sh_DATA) Shell.h $(top_builddir)/include/X11
|
cp Shell.h $(top_builddir)/include/X11
|
||||||
rm StringDefs.h Shell.h
|
rm StringDefs.h Shell.h
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
Loading…
Reference in New Issue
Block a user