summaryrefslogtreecommitdiff
path: root/event
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2006-04-27 01:06:46 -0700
committerJosh Triplett <josh@freedesktop.org>2006-04-27 01:06:46 -0700
commitefbe654893e6b443218417b49e3db5d541ff28c5 (patch)
tree9c1b8b219d2a2f20d510429835eb9514ee54b1dd /event
parentc6fab7e8addb8793210afbf011c2d00abe522e82 (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 'event')
-rw-r--r--event/Makefile.am4
1 files changed, 2 insertions, 2 deletions
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