diff options
| author | Bart Massey <bart@cs.pdx.edu> | 2008-01-27 11:41:01 -0800 |
|---|---|---|
| committer | Bart Massey <bart@cs.pdx.edu> | 2008-01-27 11:41:01 -0800 |
| commit | 083680676faab209a830b8a352586962374fcc29 (patch) | |
| tree | c37e957520b7f92acc9959da1f144346406b1a15 | |
| parent | 3350365e5612564afd7cbde86bc2833d93266102 (diff) | |
sorted out dependencies for building while uninstalled---includes horrible kludges
| -rw-r--r-- | image/Makefile.am | 1 | ||||
| -rw-r--r-- | image/xcb_image.c | 5 | ||||
| -rw-r--r-- | image/xcb_pixel.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/image/Makefile.am b/image/Makefile.am index 9a88187..1774417 100644 --- a/image/Makefile.am +++ b/image/Makefile.am @@ -1,4 +1,3 @@ - MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libxcb-image.la diff --git a/image/xcb_image.c b/image/xcb_image.c index 4c646bc..17ea59c 100644 --- a/image/xcb_image.c +++ b/image/xcb_image.c @@ -29,9 +29,10 @@ #include <xcb/xcb.h> #include <xcb/shm.h> -#include <xcb/xcb_aux.h> -#include "xcb_bitops.h" +#include "../aux/xcb_aux.h" +#include "../aux/xcb_bitops.h" #include "xcb_image.h" +#define BUILD #include "xcb_pixel.h" diff --git a/image/xcb_pixel.h b/image/xcb_pixel.h index d7d5382..fcb22b4 100644 --- a/image/xcb_pixel.h +++ b/image/xcb_pixel.h @@ -28,8 +28,10 @@ #include <inttypes.h> #include <X11/Xfuncproto.h> +#ifndef BUILD #include <xcb/xcb_bitops.h> #include <xcb/xcb_image.h> +#endif /** * XCB Image fast pixel ops. |