summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorTORRI Vincent <torri@alf94-3-82-66-248-160.fbx.proxad.net>2007-02-21 20:27:07 +0100
committerArnaud Fontaine <arnau@debian.org>2010-11-14 20:03:25 +0900
commit9ef66ccf5a535cdfe0613b9dbed593a6fb0ab63d (patch)
treeab3fcf43aa150b82bd3f55d0d12d9d18e7197d14 /image
parent1e86efa3731d285735a51b93bef8dbfd749ca559 (diff)
downloadutil-image-9ef66ccf5a535cdfe0613b9dbed593a6fb0ab63d.tar.gz
rename the libraries from libXCBFoo.* to libxcb-foo.*. Use foo_CPPFLAGS instead of foo_CFLAGS (*_CFLAGS variables store preprocessor options)
Diffstat (limited to 'image')
-rw-r--r--image/Makefile.am16
-rw-r--r--image/xcb-image.pc.in4
2 files changed, 10 insertions, 10 deletions
diff --git a/image/Makefile.am b/image/Makefile.am
index d688fca..6e4a59f 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -1,17 +1,17 @@
MAINTAINERCLEANFILES = Makefile.in
-lib_LTLIBRARIES = libXCBImage.la
+lib_LTLIBRARIES = libxcb-image.la
xcbinclude_HEADERS = xcb_image.h
AM_CFLAGS = $(CWARNFLAGS)
-XCB_IMAGE_LIBS = libXCBImage.la
+XCB_IMAGE_LIBS = libxcb-image.la
-libXCBImage_la_SOURCES = xcb_image.c
-libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_AUX_LIBS)
+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)
pkgconfig_DATA = xcb-image.pc
@@ -20,14 +20,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) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
+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_shm_SOURCES = test_xcb_image_shm.c
-test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
+test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \
$(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
test_formats_SOURCES = test_formats.c
-test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
+test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
test_formats_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
diff --git a/image/xcb-image.pc.in b/image/xcb-image.pc.in
index b1cc062..403fdd0 100644
--- a/image/xcb-image.pc.in
+++ b/image/xcb-image.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: XCBImage
+Name: XCB Image library
Description: XCB image convenience library
Version: @PACKAGE_VERSION@
Requires: xcb xcb-shm
-Libs: -L${libdir} -lXCBImage @LIBS@
+Libs: -L${libdir} -lxcb-image @LIBS@
Cflags: -I${includedir}