Split image up into its own repository

7 files changed, 21 insertions, 21 deletions

diff --git a/image/Makefile.am b/image/Makefile.am
index 2382b2f..fbb4176 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -9,8 +9,8 @@ AM_CFLAGS = $(CWARNFLAGS)
 XCB_IMAGE_LIBS = libxcb-image.la
 
 libxcb_image_la_SOURCES = xcb_image.c
-libxcb_image_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-libxcb_image_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_AUX_LIBS)
+libxcb_image_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
+libxcb_image_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_UTIL_LIBS)
 
 pkgconfig_DATA = xcb-image.pc
 
@@ -23,22 +23,22 @@ check_PROGRAMS = test_swap
 TESTS=test_swap
 
 test_swap_SOURCES = test_swap.c
-test_swap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-test_swap_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
+test_swap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
+test_swap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_IMAGE_LIBS)
 
 test_xcb_image_SOURCES = test_xcb_image.c
-test_xcb_image_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
+test_xcb_image_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
+test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_IMAGE_LIBS)
 
 test_xcb_image_shm_SOURCES = test_xcb_image_shm.c
-test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
+test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
 test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \
-	$(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
+	$(XCB_UTIL_LIBS) $(XCB_IMAGE_LIBS)
 
 test_formats_SOURCES = test_formats.c
-test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-test_formats_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
+test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
+test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_IMAGE_LIBS)
 
 test_bitmap_SOURCES = test_bitmap.c test.xbm
-test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-test_bitmap_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
+test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
+test_bitmap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_IMAGE_LIBS)
diff --git a/image/test_bitmap.c b/image/test_bitmap.c
index 3464743..c999b22 100644
--- a/image/test_bitmap.c
+++ b/image/test_bitmap.c
@@ -32,8 +32,8 @@
 #include <string.h>
 #include <assert.h>
 #include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
-#include "../event/xcb_event.h"
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_event.h>
 #include "xcb_image.h"
 
 #include "test.xbm"
diff --git a/image/test_formats.c b/image/test_formats.c
index be3b217..4becc6c 100644
--- a/image/test_formats.c
+++ b/image/test_formats.c
@@ -30,8 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
-#include "../aux/xcb_bitops.h"
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_bitops.h>
 #include "xcb_image.h"
 
 #define WIDTH 50
diff --git a/image/test_swap.c b/image/test_swap.c
index becf26b..a34e23e 100644
--- a/image/test_swap.c
+++ b/image/test_swap.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <assert.h>
 #include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
+#include <xcb/xcb_aux.h>
 #include "xcb_image.h"
 
 xcb_image_format_t  formats[] = {
diff --git a/image/test_xcb_image.c b/image/test_xcb_image.c
index ec1c924..30b61ff 100644
--- a/image/test_xcb_image.c
+++ b/image/test_xcb_image.c
@@ -33,7 +33,7 @@
 
 #include <xcb/xcb.h>
 
-#include "../aux/xcb_aux.h"
+#include <xcb/xcb_aux.h>
 #include "xcb_image.h"
 
 #define W_W 64
diff --git a/image/test_xcb_image_shm.c b/image/test_xcb_image_shm.c
index b68d637..76f7f71 100644
--- a/image/test_xcb_image_shm.c
+++ b/image/test_xcb_image_shm.c
@@ -33,7 +33,7 @@
 #include <xcb/xcb.h>
 #include <xcb/shm.h>
 
-#include "../aux/xcb_aux.h"
+#include <xcb/xcb_aux.h>
 #include "xcb_image.h"
 
 #define W_W 40
diff --git a/image/xcb_image.c b/image/xcb_image.c
index 413bdc5..ab2d144 100644
--- a/image/xcb_image.c
+++ b/image/xcb_image.c
@@ -29,8 +29,8 @@
 
 #include <xcb/xcb.h>
 #include <xcb/shm.h>
-#include "../aux/xcb_aux.h"
-#include "../aux/xcb_bitops.h"
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_bitops.h>
 #include "xcb_image.h"
 #define BUILD
 #include "xcb_pixel.h"