rename the libraries from libXCBFoo.* to libxcb-foo.*. Use foo_CPPFLAGS instead of foo_CFLAGS (*_CFLAGS variables store preprocessor options)

21 files changed, 73 insertions, 73 deletions

diff --git a/atom/Makefile.am b/atom/Makefile.am
index de642a8..11c413d 100644
--- a/atom/Makefile.am
+++ b/atom/Makefile.am
@@ -1,15 +1,15 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBAtom.la
+lib_LTLIBRARIES = libxcb-atom.la
 
 xcbinclude_HEADERS = xcb_atom.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libXCBAtom_la_SOURCES = atoms.c atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4
-libXCBAtom_la_CFLAGS = $(XCB_CFLAGS)
-libXCBAtom_la_LIBADD = $(XCB_LIBS)
+libxcb_atom_la_SOURCES = atoms.c atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4
+libxcb_atom_la_CPPFLAGS = $(XCB_CFLAGS)
+libxcb_atom_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-atom.pc
 
diff --git a/atom/xcb-atom.pc.in b/atom/xcb-atom.pc.in
index cda6d42..b59b57f 100644
--- a/atom/xcb-atom.pc.in
+++ b/atom/xcb-atom.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBAtom
+Name: XCB Atom library
 Description: XCB atom cache
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBAtom @LIBS@
+Libs: -L${libdir} -lxcb-atom @LIBS@
 Cflags: -I${includedir}
diff --git a/configure.ac b/configure.ac
index 1204b00..99442d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,15 @@ PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
 PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
 
 XCB_AUX_CFLAGS='-I$(top_srcdir)/convenient'
-XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la'
+XCB_AUX_LIBS='$(top_builddir)/convenient/libxcb-aux.la'
 XCB_ATOM_CFLAGS='-I$(top_srcdir)/atom -I$(top_builddir)/atom'
-XCB_ATOM_LIBS='$(top_builddir)/atom/libXCBAtom.la'
+XCB_ATOM_LIBS='$(top_builddir)/atom/libxcb-atom.la'
 XCB_EVENT_CFLAGS='-I$(top_srcdir)/event'
-XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la'
+XCB_EVENT_LIBS='$(top_builddir)/event/libxcb-event.la'
 XCB_PROPERTY_CFLAGS='-I$(top_srcdir)/property'
-XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la'
+XCB_PROPERTY_LIBS='$(top_builddir)/property/libxcb-property.la'
 XCB_ICCCM_CFLAGS='-I$(top_srcdir)/icccm'
-XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la'
+XCB_ICCCM_LIBS='$(top_builddir)/icccm/libxcb-icccm.la'
 AC_SUBST(XCB_AUX_CFLAGS)
 AC_SUBST(XCB_AUX_LIBS)
 AC_SUBST(XCB_ATOM_CFLAGS)
diff --git a/convenient/Makefile.am b/convenient/Makefile.am
index ebc4a10..bccfce2 100644
--- a/convenient/Makefile.am
+++ b/convenient/Makefile.am
@@ -1,15 +1,15 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBAux.la
+lib_LTLIBRARIES = libxcb-aux.la
 
 xcbinclude_HEADERS = xcb_aux.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libXCBAux_la_SOURCES = xcb_aux.c
-libXCBAux_la_CFLAGS = $(XCB_CFLAGS)
-libXCBAux_la_LIBADD = $(XCB_LIBS)
+libxcb_aux_la_SOURCES = xcb_aux.c
+libxcb_aux_la_CPPFLAGS = $(XCB_CFLAGS)
+libxcb_aux_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-aux.pc
 
diff --git a/convenient/xcb-aux.pc.in b/convenient/xcb-aux.pc.in
index 4cb5569..79ed95c 100644
--- a/convenient/xcb-aux.pc.in
+++ b/convenient/xcb-aux.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBAux library
+Name: XCB Aux library
 Description: XCB convenient functions
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBAux @LIBS@
+Libs: -L${libdir} -lxcb-aux @LIBS@
 Cflags: -I${includedir}
diff --git a/event/Makefile.am b/event/Makefile.am
index bd53055..cc085bb 100644
--- a/event/Makefile.am
+++ b/event/Makefile.am
@@ -1,15 +1,15 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBEvent.la
+lib_LTLIBRARIES = libxcb-event.la
 
 xcbinclude_HEADERS = xcb_event.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libXCBEvent_la_SOURCES = events.c
-libXCBEvent_la_CFLAGS = $(XCB_CFLAGS)
-libXCBEvent_la_LIBADD = $(XCB_LIBS)
+libxcb_event_la_SOURCES = events.c
+libxcb_event_la_CPPFLAGS = $(XCB_CFLAGS)
+libxcb_event_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-event.pc
 
diff --git a/event/xcb-event.pc.in b/event/xcb-event.pc.in
index 863fc6e..535607e 100644
--- a/event/xcb-event.pc.in
+++ b/event/xcb-event.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBEvent
+Name: XCB Event library
 Description: XCB event callback interface
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBEvent @LIBS@
+Libs: -L${libdir} -lxcb-event @LIBS@
 Cflags: -I${includedir}
diff --git a/icccm/Makefile.am b/icccm/Makefile.am
index f5ff32a..07a9d8c 100644
--- a/icccm/Makefile.am
+++ b/icccm/Makefile.am
@@ -1,16 +1,16 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBICCCM.la
+lib_LTLIBRARIES = libxcb-icccm.la
 
 xcbinclude_HEADERS = xcb_icccm.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libXCBICCCM_la_SOURCES = icccm.c
-libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) $(XCB_ATOM_CFLAGS) $(XCB_EVENT_CFLAGS) \
+libxcb_icccm_la_SOURCES = icccm.c
+libxcb_icccm_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_ATOM_CFLAGS) $(XCB_EVENT_CFLAGS) \
 	$(XCB_PROPERTY_CFLAGS)
-libXCBICCCM_la_LIBADD = $(XCB_LIBS) $(XCB_ATOM_LIBS) $(XCB_PROPERTY_LIBS)
+libxcb_icccm_la_LIBADD = $(XCB_LIBS) $(XCB_ATOM_LIBS) $(XCB_PROPERTY_LIBS)
 
 pkgconfig_DATA = xcb-icccm.pc
 
diff --git a/icccm/xcb-icccm.pc.in b/icccm/xcb-icccm.pc.in
index 9eb6613..0586560 100644
--- a/icccm/xcb-icccm.pc.in
+++ b/icccm/xcb-icccm.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBICCCM
+Name: XCB ICCCM library
 Description: XCB ICCCM binding
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-atom xcb-property
-Libs: -L${libdir} -lXCBICCCM @LIBS@
+Libs: -L${libdir} -lxcb-icccm @LIBS@
 Cflags: -I${includedir}
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}
diff --git a/keysyms/Makefile.am b/keysyms/Makefile.am
index e5a38cd..cfa3106 100644
--- a/keysyms/Makefile.am
+++ b/keysyms/Makefile.am
@@ -1,15 +1,15 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBKeysyms.la
+lib_LTLIBRARIES = libxcb-keysyms.la
 
 xcbinclude_HEADERS = xcb_keysyms.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libXCBKeysyms_la_SOURCES = keysyms.c
-libXCBKeysyms_la_CFLAGS = $(XCB_CFLAGS)
-libXCBKeysyms_la_LIBADD = $(XCB_LIBS)
+libxcb_keysyms_la_SOURCES = keysyms.c
+libxcb_keysyms_la_CPPFLAGS = $(XCB_CFLAGS)
+libxcb_keysyms_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-keysyms.pc
 
diff --git a/keysyms/xcb-keysyms.pc.in b/keysyms/xcb-keysyms.pc.in
index 596017f..249fdc0 100644
--- a/keysyms/xcb-keysyms.pc.in
+++ b/keysyms/xcb-keysyms.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBKeysyms
+Name: XCB Keysyms library
 Description: XCB Keysyms
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBKeysyms @LIBS@
+Libs: -L${libdir} -lxcb-keysyms @LIBS@
 Cflags: -I${includedir}
diff --git a/property/Makefile.am b/property/Makefile.am
index c6c7a44..6cdbba1 100644
--- a/property/Makefile.am
+++ b/property/Makefile.am
@@ -1,15 +1,15 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBProperty.la
+lib_LTLIBRARIES = libxcb-property.la
 
 xcbinclude_HEADERS = xcb_property.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libXCBProperty_la_SOURCES = prop.c
-libXCBProperty_la_CFLAGS = $(XCB_CFLAGS) $(XCB_EVENT_CFLAGS)
-libXCBProperty_la_LIBADD = $(XCB_LIBS) $(XCB_EVENT_LIBS)
+libxcb_property_la_SOURCES = prop.c
+libxcb_property_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_EVENT_CFLAGS)
+libxcb_property_la_LIBADD = $(XCB_LIBS) $(XCB_EVENT_LIBS)
 
 pkgconfig_DATA = xcb-property.pc
 
diff --git a/property/xcb-property.pc.in b/property/xcb-property.pc.in
index f329209..94cd0f7 100644
--- a/property/xcb-property.pc.in
+++ b/property/xcb-property.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBProperty
+Name: XCB Property library
 Description: XCB property convenience library
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-event
-Libs: -L${libdir} -lXCBProperty @LIBS@
+Libs: -L${libdir} -lxcb-property @LIBS@
 Cflags: -I${includedir}
diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am
index 3188a05..c017e90 100644
--- a/renderutil/Makefile.am
+++ b/renderutil/Makefile.am
@@ -1,13 +1,13 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBRenderUtil.la
+lib_LTLIBRARIES = libxcb-renderUtil.la
 
 xcbinclude_HEADERS = xcb_renderutil.h
 
-libXCBRenderUtil_la_SOURCES = cache.c util.c glyph.c
-libXCBRenderUtil_la_CFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS)
-libXCBRenderUtil_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS)
+libxcb_renderUtil_la_SOURCES = cache.c util.c glyph.c
+libxcb_renderUtil_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS)
+libxcb_renderUtil_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS)
 
 pkgconfig_DATA = xcb-renderutil.pc
 
diff --git a/renderutil/xcb-renderutil.pc.in b/renderutil/xcb-renderutil.pc.in
index 62a0994..a746c15 100644
--- a/renderutil/xcb-renderutil.pc.in
+++ b/renderutil/xcb-renderutil.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBRenderUtil
+Name: XCB RenderUtil library
 Description: XCB RENDER-extension utilities library
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-render
-Libs: -L${libdir} -lXCBRenderUtil @LIBS@
+Libs: -L${libdir} -lxcb-renderUtil @LIBS@
 Cflags: -I${includedir}
diff --git a/reply/Makefile.am b/reply/Makefile.am
index 06b03c8..847d0f7 100644
--- a/reply/Makefile.am
+++ b/reply/Makefile.am
@@ -1,17 +1,17 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBReply.la
+lib_LTLIBRARIES = libxcb-reply.la
 
 xcbinclude_HEADERS = xcb_reply.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-XCB_REPLY_LIBS = libXCBReply.la
+XCB_REPLY_LIBS = libxcb-reply.la
 
-libXCBReply_la_SOURCES = reply.c
-libXCBReply_la_CFLAGS = $(XCB_CFLAGS)
-libXCBReply_la_LIBADD = $(XCB_LIBS) -lpthread
+libxcb_reply_la_SOURCES = reply.c
+libxcb_reply_la_CPPFLAGS = $(XCB_CFLAGS)
+libxcb_reply_la_LIBADD = $(XCB_LIBS) -lpthread
 
 pkgconfig_DATA = xcb-reply.pc
 
@@ -19,6 +19,6 @@ EXTRA_DIST=xcb-reply.pc.in
 
 noinst_PROGRAMS = test_reply
 
-test_reply_CFLAGS = $(XCB_CFLAGS)
+test_reply_CPPFLAGS = $(XCB_CFLAGS)
 test_reply_LDADD = $(XCB_LIBS) $(XCB_REPLY_LIBS)
 test_reply_SOURCES = test_reply.c
diff --git a/reply/xcb-reply.pc.in b/reply/xcb-reply.pc.in
index a383165..3299a5f 100644
--- a/reply/xcb-reply.pc.in
+++ b/reply/xcb-reply.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBReply
+Name: XCB Reply library
 Description: XCB reply convenience library
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBReply @LIBS@
+Libs: -L${libdir} -lxcb-reply @LIBS@
 Cflags: -I${includedir}
diff --git a/wm/Makefile.am b/wm/Makefile.am
index c436185..943208b 100644
--- a/wm/Makefile.am
+++ b/wm/Makefile.am
@@ -1,22 +1,22 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libXCBWM.la
+lib_LTLIBRARIES = libxcb-wm.la
 
 xcbinclude_HEADERS = xcb_wm.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-XCB_XCBWM_LIBS = libXCBWM.la
+XCB_XCBWM_LIBS = libxcb-wm.la
 
-libXCBWM_la_SOURCES = manage.c table.c
-libXCBWM_la_CFLAGS = $(XCB_CFLAGS) \
+libxcb_wm_la_SOURCES = manage.c table.c
+libxcb_wm_la_CPPFLAGS = $(XCB_CFLAGS) \
 	$(XCB_AUX_CFLAGS) \
 	$(XCB_ATOM_CFLAGS) \
 	$(XCB_EVENT_CFLAGS) \
 	$(XCB_PROPERTY_CFLAGS) \
 	$(XCB_ICCCM_CFLAGS)
-libXCBWM_la_LIBADD = $(XCB_LIBS) \
+libxcb_wm_la_LIBADD = $(XCB_LIBS) \
 	$(XCB_AUX_LIBS) \
 	$(XCB_ATOM_LIBS) \
 	$(XCB_EVENT_LIBS) \
@@ -30,7 +30,7 @@ EXTRA_DIST = xcb-wm.pc.in
 noinst_PROGRAMS = xcbwm-test
 
 xcbwm_test_SOURCES = xcbwm-test.c reply_formats.c reply_formats.h
-xcbwm_test_CFLAGS = $(XCB_CFLAGS) \
+xcbwm_test_CPPFLAGS = $(XCB_CFLAGS) \
 	$(XCB_AUX_CFLAGS) \
 	$(XCB_ATOM_CFLAGS) \
 	$(XCB_EVENT_CFLAGS) \
diff --git a/wm/xcb-wm.pc.in b/wm/xcb-wm.pc.in
index b8d05a7..0ed613a 100644
--- a/wm/xcb-wm.pc.in
+++ b/wm/xcb-wm.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBWM
+Name: XCB WM library
 Description: XCB window manager convenience library
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-atom xcb-event xcb-property xcb-icccm
-Libs: -L${libdir} -lXCBWM @LIBS@
+Libs: -L${libdir} -lxcb-wm @LIBS@
 Cflags: -I${includedir}