diff options
| author | Donnie Berkholz <spyderous@gentoo.org> | 2006-05-07 20:32:32 -0700 |
|---|---|---|
| committer | Arnaud Fontaine <arnau@debian.org> | 2010-11-14 20:02:38 +0900 |
| commit | ee30f2ed8eda9a020f55d71ea0c7db8851e9c555 (patch) | |
| tree | a476b1fe399977ee1c81dc27c0085d59970b4326 | |
| parent | 4f7e101f77519e2b5ba83f18b5de95efce317da1 (diff) | |
Add correct dependencies in xcb-util.
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | image/Makefile.am | 18 |
2 files changed, 31 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 75ff819..e29ba58 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,27 @@ AC_SUBST(pkgconfigdir) PKG_CHECK_MODULES(XCB, xcb) PKG_CHECK_MODULES(XCB_SHM, xcb-shm) +XCB_AUX_CFLAGS='-I$(top_builddir)/convenient' +XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la' +XCB_ATOM_CFLAGS='-I$(top_builddir)/atom' +XCB_ATOM_LIBS='$(top_builddir)/atom/libXCBAtom.la' +XCB_EVENT_CFLAGS='-I$(top_builddir)/event' +XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la' +XCB_PROPERTY_CFLAGS='-I$(top_builddir)/property' +XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la' +XCB_ICCCM_CFLAGS='-I$(top_builddir)/icccm' +XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la' +AC_SUBST(XCB_AUX_CFLAGS) +AC_SUBST(XCB_AUX_LIBS) +AC_SUBST(XCB_ATOM_CFLAGS) +AC_SUBST(XCB_ATOM_LIBS) +AC_SUBST(XCB_EVENT_CFLAGS) +AC_SUBST(XCB_EVENT_LIBS) +AC_SUBST(XCB_PROPERTY_CFLAGS) +AC_SUBST(XCB_PROPERTY_LIBS) +AC_SUBST(XCB_ICCCM_CFLAGS) +AC_SUBST(XCB_ICCCM_LIBS) + AC_OUTPUT([Makefile convenient/Makefile convenient/xcb-aux.pc reply/Makefile reply/xcb-reply.pc diff --git a/image/Makefile.am b/image/Makefile.am index 8bae709..1237aad 100644 --- a/image/Makefile.am +++ b/image/Makefile.am @@ -7,9 +7,11 @@ xcbinclude_HEADERS = xcb_image.h AM_CFLAGS = -Wall +XCB_IMAGE_LIBS = libXCBImage.la + 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 +libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) +libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_AUX_LIBS) pkgconfig_DATA = xcb-image.pc @@ -18,14 +20,14 @@ EXTRA_DIST=xcb-image.pc.in noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_xcb_image_SOURCES = test_xcb_image.c -test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient -test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage +test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) +test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) test_xcb_image_shm_SOURCES = test_xcb_image_shm.c -test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient +test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \ - -L../convenient -lXCBAux -lXCBImage + $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) test_formats_SOURCES = test_formats.c -test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient -test_formats_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage +test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) +test_formats_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) |