diff options
| author | Keith Packard <keithp@evo.keithp.com> | 2006-02-24 02:23:27 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@evo.keithp.com> | 2006-02-24 02:23:27 +0100 |
| commit | 43de9d4e70b66eb6afb8d62ce1af6c100f5d7786 (patch) | |
| tree | 1b9de0e87b8af3db1c233399003ac705ee679ee5 | |
| parent | ce5d32236723e984c1e1a3d43d9d252c20092afe (diff) | |
| download | xorg-proto-fixesproto-43de9d4e70b66eb6afb8d62ce1af6c100f5d7786.tar.gz | |
Import changes from Xorg repository
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | fixesproto.pc.in | 4 |
4 files changed, 18 insertions, 14 deletions
@@ -1,3 +1,8 @@ +2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: + Update package version number for final X11R7 release candidate. + 2004-07-26 Keith Packard <keithp@keithp.com> * configure.ac: diff --git a/Makefile.am b/Makefile.am index ca6f211..953e62a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,17 +21,16 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -fixesextincludedir = $(includedir)/X11/extensions -fixesextinclude_HEADERS = \ - xfixesproto.h \ +fixesdir = $(includedir)/X11/extensions +fixes_HEADERS = \ + xfixesproto.h \ xfixeswire.h - -fixesextdocdir = $(datadir)/doc/fixesext -fixesextdoc_DATA = protocol +fixesdocdir = $(datadir)/doc/XFixes +fixesdoc_DATA = protocol pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = fixesext.pc +pkgconfig_DATA = fixesproto.pc -EXTRA_DIST = autogen.sh fixesext.pc.in $(fixesextdoc_DATA) +EXTRA_DIST = autogen.sh fixesproto.pc.in $(fixesdoc_DATA) diff --git a/configure.ac b/configure.ac index 923f97a..0136954 100644 --- a/configure.ac +++ b/configure.ac @@ -24,12 +24,12 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([fixesext], [3.0.0], [keithp@keithp.com], fixesext) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_INIT([FixesProto], [3.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -PKG_CHECK_MODULES(XEXTENSIONS, xextensions) +XORG_RELEASE_VERSION AC_OUTPUT([Makefile - fixesext.pc]) + fixesproto.pc]) diff --git a/fixesproto.pc.in b/fixesproto.pc.in index a8c038d..454ed8d 100644 --- a/fixesproto.pc.in +++ b/fixesproto.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: FixesExt +Name: FixesProto Description: X Fixes extension headers Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @XEXTENSIONS_CFLAGS@ +Cflags: -I${includedir} |