Fix xcb-util library dependencies, including both the new dependency libXCBImage needs on libXCBShm, as well as many other issues discovered in the process. These include using automake variables appropriately in order to actually link shared libraries against each other and ensure libraries have NEEDED entries for the libraries they depend on, consequently needing to reorder the top-level SUBDIRS to build property before icccm, adding dependencies to .pc.in files, fixing .pc.in files to not all use the name and description for XCBImage, and adding appropriate library dependencies to test programs.

14 files changed, 52 insertions, 33 deletions

diff --git a/Makefile.am b/Makefile.am
index 88a8993..f3ae5d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = atom convenient event icccm image keysyms property reply wm
+SUBDIRS = atom convenient event property icccm image keysyms reply wm
diff --git a/atom/Makefile.am b/atom/Makefile.am
index 247dc6f..50011a2 100644
--- a/atom/Makefile.am
+++ b/atom/Makefile.am
@@ -6,10 +6,10 @@ lib_LTLIBRARIES = libXCBAtom.la
 xcbinclude_HEADERS = xcb_atom.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS)
-LDADD = $(XCB_LIBS)
 
 libXCBAtom_la_SOURCES = atoms.c
+libXCBAtom_la_CFLAGS = $(XCB_CFLAGS)
+libXCBAtom_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-atom.pc
 
diff --git a/configure.ac b/configure.ac
index 4f5bbd7..90d75e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ pkgconfigdir='${libdir}/pkgconfig'
 AC_SUBST(pkgconfigdir)
 
 PKG_CHECK_MODULES(XCB, xcb)
+PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
 
 AC_OUTPUT([Makefile
 	convenient/Makefile convenient/xcb-aux.pc
diff --git a/convenient/Makefile.am b/convenient/Makefile.am
index c0e9a0b..bd9eab4 100644
--- a/convenient/Makefile.am
+++ b/convenient/Makefile.am
@@ -6,10 +6,10 @@ lib_LTLIBRARIES = libXCBAux.la
 xcbinclude_HEADERS = xcb_aux.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS)
-LDADD = $(XCB_LIBS)
 
 libXCBAux_la_SOURCES = xcb_aux.c
+libXCBAux_la_CFLAGS = $(XCB_CFLAGS)
+libXCBAux_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-aux.pc
 
diff --git a/event/Makefile.am b/event/Makefile.am
index 2b83c56..32440bd 100644
--- a/event/Makefile.am
+++ b/event/Makefile.am
@@ -6,10 +6,10 @@ lib_LTLIBRARIES = libXCBEvent.la
 xcbinclude_HEADERS = xcb_event.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS)
-LDADD = $(XCB_LIBS)
 
 libXCBEvent_la_SOURCES = events.c
+libXCBEvent_la_CFLAGS = $(XCB_CFLAGS)
+libXCBEvent_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-event.pc
 
diff --git a/icccm/Makefile.am b/icccm/Makefile.am
index f7f8a5a..dd63eb5 100644
--- a/icccm/Makefile.am
+++ b/icccm/Makefile.am
@@ -6,14 +6,14 @@ lib_LTLIBRARIES = libXCBICCCM.la
 xcbinclude_HEADERS = xcb_icccm.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS) -I../atom -I../event -I../property
-LDADD = $(XCB_LIBS) \
+
+libXCBICCCM_la_SOURCES = icccm.c
+libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) -I../atom -I../event -I../property
+libXCBICCCM_la_LIBADD = $(XCB_LIBS) \
 	-L../atom -lXCBAtom \
 	-L../event -lXCBEvent \
 	-L../property -lXCBProperty
 
-libXCBICCCM_la_SOURCES = icccm.c
-
 pkgconfig_DATA = xcb-icccm.pc
 
 EXTRA_DIST = xcb-icccm.pc.in
diff --git a/image/Makefile.am b/image/Makefile.am
index 522102f..6535ecd 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -6,10 +6,10 @@ lib_LTLIBRARIES = libXCBImage.la
 xcbinclude_HEADERS = xcb_image.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS) -I../convenient
-LDADD = $(XCB_LIBS) -L../convenient -lXCBAux
 
 libXCBImage_la_SOURCES = xcb_image.c
+libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient
+libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) -L../convenient -lXCBAux
 
 pkgconfig_DATA = xcb-image.pc
 
@@ -17,11 +17,14 @@ EXTRA_DIST=xcb-image.pc.in
 
 noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats
 
-test_xcb_image_LDADD = $(LDADD) -L. -lXCBImage
 test_xcb_image_SOURCES = test_xcb_image.c
+test_xcb_image_CFLAGS = -I../convenient
+test_xcb_image_LDADD =  -L../convenient -lXCBAux -lXCBImage
 
-test_xcb_image_shm_LDADD = $(LDADD) -L. -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_formats_LDADD = $(LDADD) -L. -lXCBImage
 test_formats_SOURCES = test_formats.c
+test_formats_CFLAGS = -I../convenient
+test_formats_LDADD = -L../convenient -lXCBAux -lXCBImage
diff --git a/image/xcb-image.pc.in b/image/xcb-image.pc.in
index 8f7771c..b1cc062 100644
--- a/image/xcb-image.pc.in
+++ b/image/xcb-image.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: XCBImage
 Description: XCB image convenience library
 Version: @PACKAGE_VERSION@
-Requires: xcb
+Requires: xcb xcb-shm
 Libs: -L${libdir} -lXCBImage @LIBS@
 Cflags: -I${includedir}
diff --git a/keysyms/Makefile.am b/keysyms/Makefile.am
index 1d602f3..6765333 100644
--- a/keysyms/Makefile.am
+++ b/keysyms/Makefile.am
@@ -6,10 +6,10 @@ lib_LTLIBRARIES = libXCBKeysyms.la
 xcbinclude_HEADERS = xcb_keysyms.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS)
-LDADD = $(XCB_LIBS)
 
 libXCBKeysyms_la_SOURCES = keysyms.c
+libXCBKeysyms_la_CFLAGS = $(XCB_CFLAGS)
+libXCBKeysyms_la_LIBADD = $(XCB_LIBS)
 
 pkgconfig_DATA = xcb-keysyms.pc
 
diff --git a/property/Makefile.am b/property/Makefile.am
index d7b0fea..9282a10 100644
--- a/property/Makefile.am
+++ b/property/Makefile.am
@@ -6,10 +6,10 @@ lib_LTLIBRARIES = libXCBProperty.la
 xcbinclude_HEADERS = xcb_property.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS) -I../event
-LDADD = $(XCB_LIBS) -L../event -lXCBEvent
 
 libXCBProperty_la_SOURCES = prop.c
+libXCBProperty_la_CFLAGS = $(XCB_CFLAGS) -I../event
+libXCBProperty_la_LIBADD = $(XCB_LIBS) -L../event -lXCBEvent
 
 pkgconfig_DATA = xcb-property.pc
 
diff --git a/property/xcb-property.pc.in b/property/xcb-property.pc.in
index 543bdc5..f329209 100644
--- a/property/xcb-property.pc.in
+++ b/property/xcb-property.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBImage
-Description: XCB image convenience library
+Name: XCBProperty
+Description: XCB property convenience library
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-event
 Libs: -L${libdir} -lXCBProperty @LIBS@
diff --git a/reply/Makefile.am b/reply/Makefile.am
index ddfffa6..8e83143 100644
--- a/reply/Makefile.am
+++ b/reply/Makefile.am
@@ -6,11 +6,10 @@ lib_LTLIBRARIES = libXCBReply.la
 xcbinclude_HEADERS = xcb_reply.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS)
-LDADD = $(XCB_LIBS)
 
-libXCBReply_la_LIBADD = -lpthread
 libXCBReply_la_SOURCES = reply.c
+libXCBReply_la_CFLAGS = $(XCB_CFLAGS)
+libXCBReply_la_LIBADD = $(XCB_LIBS) -lpthread
 
 pkgconfig_DATA = xcb-reply.pc
 
diff --git a/wm/Makefile.am b/wm/Makefile.am
index 994aec6..9b43a93 100644
--- a/wm/Makefile.am
+++ b/wm/Makefile.am
@@ -6,21 +6,37 @@ lib_LTLIBRARIES = libXCBWM.la
 xcbinclude_HEADERS = xcb_wm.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS) -I../convenient -I../atom -I../event -I../property -I../icccm
-LDADD = $(XCB_LIBS) \
+
+libXCBWM_la_SOURCES = manage.c table.c
+libXCBWM_la_CFLAGS = $(XCB_CFLAGS) \
+	-I../convenient \
+	-I../atom \
+	-I../event \
+	-I../property \
+	-I../icccm
+libXCBWM_la_LIBADD = $(XCB_LIBS) \
 	-L../convenient -lXCBAux \
 	-L../atom -lXCBAtom \
 	-L../event -lXCBEvent \
 	-L../property -lXCBProperty \
 	-L../icccm -lXCBICCCM
 
-libXCBWM_la_SOURCES = manage.c table.c
-
 pkgconfig_DATA = xcb-wm.pc
 
 EXTRA_DIST = xcb-wm.pc.in
 
 noinst_PROGRAMS = xcbwm-test
 
-xcbwm_test_LDADD = $(LDADD) -L. -lXCBWM -lpthread
 xcbwm_test_SOURCES = xcbwm-test.c reply_formats.c reply_formats.h
+xcbwm_test_CFLAGS = $(XCB_CFLAGS) \
+	-I../convenient \
+	-I../atom \
+	-I../event \
+	-I../property \
+	-I../icccm
+xcbwm_test_LDADD = $(XCB_LIBS) \
+	-L../convenient -lXCBAux \
+	-L../event -lXCBEvent \
+	-L../property -lXCBProperty \
+	-L../icccm -lXCBICCCM \
+	-lXCBWM -lpthread
diff --git a/wm/xcb-wm.pc.in b/wm/xcb-wm.pc.in
index 07c840d..b8d05a7 100644
--- a/wm/xcb-wm.pc.in
+++ b/wm/xcb-wm.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: XCBImage
-Description: XCB image convenience library
+Name: XCBWM
+Description: XCB window manager convenience library
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-atom xcb-event xcb-property xcb-icccm
 Libs: -L${libdir} -lXCBWM @LIBS@