diff options
| author | Josh Triplett <josh@freedesktop.org> | 2006-04-28 11:19:36 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2006-04-28 11:19:36 -0700 |
| commit | 6bf208e96539af3a12b56dc56075dacc436f2381 (patch) | |
| tree | e64fe5a5b1a86205d616e1e04a2c3b957ca11fd4 | |
| parent | f5f523943349418cf2dde5abbda608a84a779cfa (diff) | |
Make xcb_image.h self-contained by including the xcb.h and shm.h headers. Remove unused headers from the libXCBImage test programs. Change Makefile.am to match the headers and libraries actually used by the test programs.
| -rw-r--r-- | image/Makefile.am | 13 | ||||
| -rw-r--r-- | image/test_formats.c | 1 | ||||
| -rw-r--r-- | image/test_xcb_image.c | 1 | ||||
| -rw-r--r-- | image/xcb_image.h | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/image/Makefile.am b/image/Makefile.am index c7912ed..8bae709 100644 --- a/image/Makefile.am +++ b/image/Makefile.am @@ -18,13 +18,14 @@ EXTRA_DIST=xcb-image.pc.in noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_xcb_image_SOURCES = test_xcb_image.c -test_xcb_image_CFLAGS = $(XCB_CFLAGS) -I../convenient -test_xcb_image_LDADD = -L../convenient -lXCBAux -lXCBImage +test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient +test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage test_xcb_image_shm_SOURCES = test_xcb_image_shm.c -test_xcb_image_shm_CFLAGS = $(XCB_SHM_CFLAGS) -I../convenient -test_xcb_image_shm_LDADD = $(XCB_SHM_LIBS) -L../convenient -lXCBAux -lXCBImage +test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient +test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \ + -L../convenient -lXCBAux -lXCBImage test_formats_SOURCES = test_formats.c -test_formats_CFLAGS = $(XCB_SHM_CFLAGS) -I../convenient -test_formats_LDADD = $(XCB_SHM_LIBS) -L../convenient -lXCBAux -lXCBImage +test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient +test_formats_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage diff --git a/image/test_formats.c b/image/test_formats.c index 98b60b4..009d185 100644 --- a/image/test_formats.c +++ b/image/test_formats.c @@ -1,5 +1,4 @@ #include <X11/XCB/xcb.h> -#include <X11/XCB/shm.h> #include "xcb_image.h" #include "xcb_aux.h" #include <stdio.h> diff --git a/image/test_xcb_image.c b/image/test_xcb_image.c index 36a2c7d..cd16c50 100644 --- a/image/test_xcb_image.c +++ b/image/test_xcb_image.c @@ -4,7 +4,6 @@ #include <stdio.h> #include <X11/XCB/xcb.h> -#include <X11/XCB/shm.h> #include "xcb_aux.h" #include "xcb_image.h" diff --git a/image/xcb_image.h b/image/xcb_image.h index 1a54550..ffdb607 100644 --- a/image/xcb_image.h +++ b/image/xcb_image.h @@ -1,7 +1,8 @@ #ifndef __XCB_IMAGE_H__ #define __XCB_IMAGE_H__ - +#include <X11/XCB/xcb.h> +#include <X11/XCB/shm.h> /** * @defgroup XCB_Image XCB Image Functions |