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 /property | |
| 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 'property')
| -rw-r--r-- | property/Makefile.am | 4 | ||||
| -rw-r--r-- | property/xcb-property.pc.in | 4 |
2 files changed, 4 insertions, 4 deletions
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@ |