diff options
| author | Josh Triplett <josh@freedesktop.org> | 2006-04-27 01:06:46 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2006-04-27 01:06:46 -0700 |
| commit | efbe654893e6b443218417b49e3db5d541ff28c5 (patch) | |
| tree | 9c1b8b219d2a2f20d510429835eb9514ee54b1dd /image | |
| parent | c6fab7e8addb8793210afbf011c2d00abe522e82 (diff) | |
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.
Diffstat (limited to 'image')
| -rw-r--r-- | image/Makefile.am | 13 | ||||
| -rw-r--r-- | image/xcb-image.pc.in | 2 |
2 files changed, 9 insertions, 6 deletions
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} |