[Xcb-commit] 3 commits - libXamine xcb-demo xcb-util

[Josh Triplett]

 libXamine/configure.ac      |    2 +-
 xcb-demo/app/xte/Makefile   |    4 ++--
 xcb-demo/configure.ac       |    2 +-
 xcb-util/configure.ac       |    2 +-
 xcb-util/reply/Makefile.am  |    3 ++-
 xcb-util/reply/test_reply.c |    1 +
 6 files changed, 8 insertions(+), 6 deletions(-)

New commits:
diff-tree f3c1330bf2a7e716c53b2e67782dcbe273a829c5 (from 063c7782856e5027baa1b59a2394b851c1de9dca)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Thu Apr 27 12:00:49 2006 -0700

    test_reply uses libXCB directly, so stop relying on XCBReply to pull in the headers and libraries for XCB.

diff --git a/xcb-util/reply/Makefile.am b/xcb-util/reply/Makefile.am
index 8e83143..8fc5afb 100644
--- a/xcb-util/reply/Makefile.am
+++ b/xcb-util/reply/Makefile.am
@@ -17,5 +17,6 @@ EXTRA_DIST=xcb-reply.pc.in
 
 noinst_PROGRAMS = test_reply
 
-test_reply_LDADD = $(LDADD) -L. -lXCBReply
+test_reply_CFLAGS = $(XCB_CFLAGS)
+test_reply_LDADD = $(XCB_LIBS) -lXCBReply
 test_reply_SOURCES = test_reply.c
diff --git a/xcb-util/reply/test_reply.c b/xcb-util/reply/test_reply.c
index d6948fa..a8ba254 100644
--- a/xcb-util/reply/test_reply.c
+++ b/xcb-util/reply/test_reply.c
@@ -1,3 +1,4 @@
+#include <X11/XCB/xcb.h>
 #include "xcb_reply.h"
 
 #include <string.h>
diff-tree 063c7782856e5027baa1b59a2394b851c1de9dca (from 612f1bb8061a8d561bb059615af9583e91c6f3f1)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Thu Apr 27 11:47:09 2006 -0700

    Use pkg-config to find libXCBxtest in the Makefile for the xtest test application.

diff --git a/xcb-demo/app/xte/Makefile b/xcb-demo/app/xte/Makefile
index b602e80..84f64ba 100644
--- a/xcb-demo/app/xte/Makefile
+++ b/xcb-demo/app/xte/Makefile
@@ -1,6 +1,6 @@
-pkgs = xcb xcb-keysyms
+pkgs = xcb xcb-keysyms xcb-xtest
 CFLAGS = `pkg-config --cflags $(pkgs)` -g -Wall -Wpointer-arith -Wstrict-prototypes
-LIBS = `pkg-config --libs $(pkgs)` -lXCBxtest
+LIBS = `pkg-config --libs $(pkgs)`
 
 xte:	xte.c
 	$(CC) $(CFLAGS) xte.c $(LIBS) -o xte
diff-tree 612f1bb8061a8d561bb059615af9583e91c6f3f1 (from 0ed3e721ab504e06ab1da084da3bafd23b8b01fb)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Thu Apr 27 11:25:28 2006 -0700

    Set all package bugreporting addresses to xcb at lists.freedesktop.org

diff --git a/libXamine/configure.ac b/libXamine/configure.ac
index c344e92..95bab61 100644
--- a/libXamine/configure.ac
+++ b/libXamine/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libXamine], 0.1, [josh at freedesktop.org])
+AC_INIT([libXamine], 0.1, [xcb at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([libXamine.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
 
diff --git a/xcb-demo/configure.ac b/xcb-demo/configure.ac
index 69fbe55..35f9584 100644
--- a/xcb-demo/configure.ac
+++ b/xcb-demo/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT([xcb-demo],0.8,[jamey at minilop.net])
+AC_INIT([xcb-demo],0.8,[xcb at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_CONFIG_HEADER(config.h)
diff --git a/xcb-util/configure.ac b/xcb-util/configure.ac
index 90d75e4..75ff819 100644
--- a/xcb-util/configure.ac
+++ b/xcb-util/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT([xcb-util],0.1,[jamey at minilop.net])
+AC_INIT([xcb-util],0.1,[xcb at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])