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 | 122cc67f76886e1f996645cd402c0d473d85f408 (patch) | |
| tree | ea3264a881a553803ff3eb427cec947507aed3f6 | |
| parent | c88fa5935eeee20481bfe466cc18e3870bb96b18 (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.
| -rw-r--r-- | atom/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | event/Makefile.am | 4 |
3 files changed, 5 insertions, 4 deletions
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/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 |