diff options
| author | Keith Packard <keithp@evo.keithp.com> | 2006-02-24 02:01:10 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@evo.keithp.com> | 2006-02-24 02:01:10 +0100 |
| commit | 369d28141b1b296abeb4365b5c57846d72faeb82 (patch) | |
| tree | 57f637fd97cf8adce04d558013ad7de94db3fe0d | |
| parent | 7388d4f6dd9e0c71d79c33905135622be15ccd13 (diff) | |
Paste Xorg changes on top of historical xlibs repository
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | compositeproto.pc.in (renamed from compositeext.pc.in) | 0 | ||||
| -rw-r--r-- | configure.ac | 8 |
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-08 Keith Packard <keithp@keithp.com> * composite.h: diff --git a/Makefile.am b/Makefile.am index 62c2a96..7b036ab 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. -compositeextincludedir = $(includedir)/X11/extensions - -compositeextinclude_HEADERS = \ - compositeproto.h \ - composite.h - -compositeextdocdir = $(datadir)/doc/compositeext -compositeextdoc_DATA = protocol +compositedir = $(includedir)/X11/extensions +composite_HEADERS = \ + composite.h \ + compositeproto.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = compositeext.pc +pkgconfig_DATA = compositeproto.pc + +compositedocdir = $(datadir)/doc/Composite +compositedoc_DATA = protocol -EXTRA_DIST = autogen.sh compositeext.pc.in $(compositeextdoc_DATA) +EXTRA_DIST = autogen.sh compositeproto.pc.in $(compositeextdoc_DATA) diff --git a/compositeext.pc.in b/compositeproto.pc.in index 6e53f0b..6e53f0b 100644 --- a/compositeext.pc.in +++ b/compositeproto.pc.in diff --git a/configure.ac b/configure.ac index afc855a..8f34ebc 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([compositeext], [2.0], [keithp@keithp.com], compositeext) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_INIT([COmpositeProto], [0.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -PKG_CHECK_MODULES(COMPOSITEEXT, xextensions fixesext) +XORG_RELEASE_VERSION AC_OUTPUT([Makefile - compositeext.pc]) + compositeproto.pc]) |